diff --git a/app/Services/Context/AssetUploader.php b/app/Services/Context/AssetUploader.php
index 519dc43..bc4748f 100644
--- a/app/Services/Context/AssetUploader.php
+++ b/app/Services/Context/AssetUploader.php
@@ -8,7 +8,9 @@
 use App\Models\Project;
 use App\Models\Story;
 use App\Models\User;
+use App\Services\Stories\StoryRevisionLifecycle;
 use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
@@ -23,6 +25,8 @@
  */
 class AssetUploader
 {
+    public function __construct(private StoryRevisionLifecycle $revisions) {}
+
     public function store(UploadedFile $file, Project $project, ?Story $story, User $actor): ContextItem
     {
         $this->ensureStoryBelongsToProject($project, $story);
@@ -36,30 +40,49 @@ public function store(UploadedFile $file, Project $project, ?Story $story, User
             throw new \RuntimeException('Failed to store uploaded asset.');
         }
 
-        return ContextItem::create([
-            'project_id' => $project->getKey(),
-            'story_id' => $story?->getKey(),
-            'type' => ContextItemType::File,
-            'title' => $file->getClientOriginalName() ?: basename($storedPath),
-            'description' => null,
-            'metadata' => [
-                'disk' => $disk,
-                'path' => $storedPath,
-                'original_name' => $file->getClientOriginalName(),
-                // Server-detected MIME — getClientMimeType() is user-controlled and
-                // trivial to spoof. The detected value is what we record and what
-                // later checks should rely on.
-                'mime' => $file->getMimeType() ?: 'application/octet-stream',
-                'size' => $file->getSize(),
-            ],
-            // File items stay Skipped: there is no extraction pipeline yet,
-            // so ContextCompressor would have no body to compress and
-            // would mark Skipped on the first job run anyway. When the
-            // PDF/text extractor lands, this can flip to Pending and the
-            // extractor will dispatch SummariseContextItemJob from there.
-            'summary_status' => ContextItemSummaryStatus::Skipped,
-            'created_by_id' => $actor->getKey(),
-        ]);
+        return DB::transaction(function () use ($project, $story, $actor, $disk, $storedPath, $file): ContextItem {
+            $item = ContextItem::create([
+                'project_id' => $project->getKey(),
+                'story_id' => $story?->getKey(),
+                'type' => ContextItemType::File,
+                'title' => $file->getClientOriginalName() ?: basename($storedPath),
+                'description' => null,
+                'metadata' => [
+                    'disk' => $disk,
+                    'path' => $storedPath,
+                    'original_name' => $file->getClientOriginalName(),
+                    // Server-detected MIME — getClientMimeType() is user-controlled and
+                    // trivial to spoof. The detected value is what we record and what
+                    // later checks should rely on.
+                    'mime' => $file->getMimeType() ?: 'application/octet-stream',
+                    'size' => $file->getSize(),
+                ],
+                // File items stay Skipped: there is no extraction pipeline yet,
+                // so ContextCompressor would have no body to compress and
+                // would mark Skipped on the first job run anyway. When the
+                // PDF/text extractor lands, this can flip to Pending and the
+                // extractor will dispatch SummariseContextItemJob from there.
+                'summary_status' => ContextItemSummaryStatus::Skipped,
+                'created_by_id' => $actor->getKey(),
+            ]);
+
+            // Story-scoped uploads must follow the same approval-reopen +
+            // auto-include contract as `ContextItemWriter::createStoryItem`
+            // (per ADR-0015). Without these two calls, a file uploaded
+            // through the Story panel would silently bypass approval review
+            // and never appear in the picker as included.
+            if ($story !== null) {
+                $story->includedContextItems()->syncWithoutDetaching([
+                    $item->getKey() => [
+                        'included_at' => now(),
+                        'included_by_id' => $actor->getKey(),
+                    ],
+                ]);
+                $this->revisions->recordContentArtifactChanged($story);
+            }
+
+            return $item;
+        });
     }
 
     private function ensureStoryBelongsToProject(Project $project, ?Story $story): void
diff --git "a/resources/views/pages/context-items/\342\232\241project-assets-panel.blade.php" "b/resources/views/pages/context-items/\342\232\241project-assets-panel.blade.php"
new file mode 100644
index 0000000..80a7af2
--- /dev/null
+++ "b/resources/views/pages/context-items/\342\232\241project-assets-panel.blade.php"
@@ -0,0 +1,264 @@
+<?php
+
+use App\Enums\ContextItemType;
+use App\Models\ContextItem;
+use App\Models\Project;
+use App\Services\Context\AssetUploader;
+use App\Services\Context\ContextItemWriter;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Auth;
+use Livewire\Attributes\Computed;
+use Livewire\Attributes\Validate;
+use Livewire\Component;
+use Livewire\WithFileUploads;
+
+new class extends Component {
+    use WithFileUploads;
+
+    public int $project_id;
+
+    #[Validate('required|in:text,link,file')]
+    public string $newType = 'text';
+
+    #[Validate('required|string|max:255')]
+    public string $newTitle = '';
+
+    #[Validate('nullable|string|max:10000')]
+    public string $newBody = '';
+
+    #[Validate('nullable|url')]
+    public string $newUrl = '';
+
+    public mixed $newFile = null;
+
+    public ?int $editingId = null;
+
+    #[Validate('required|string|max:255')]
+    public string $editTitle = '';
+
+    #[Validate('nullable|string|max:10000')]
+    public string $editBody = '';
+
+    public function mount(int $projectId): void
+    {
+        $this->project_id = $projectId;
+        $this->ensureMember();
+    }
+
+    #[Computed]
+    public function project(): ?Project
+    {
+        return Project::query()
+            ->whereIn('id', Auth::user()->accessibleProjectIds())
+            ->find($this->project_id);
+    }
+
+    #[Computed]
+    public function items()
+    {
+        $project = $this->project;
+        if ($project === null) {
+            return collect();
+        }
+
+        return $project->contextItems()
+            ->whereNull('story_id')
+            ->orderByDesc('id')
+            ->get();
+    }
+
+    public function create(): void
+    {
+        $this->ensureMember();
+
+        $rules = ['newType' => 'required|in:text,link,file', 'newTitle' => 'required|string|max:255'];
+        match ($this->newType) {
+            'text' => $rules['newBody'] = 'required|string|max:10000',
+            'link' => $rules['newUrl'] = 'required|url',
+            'file' => $rules['newFile'] = 'required|file',
+        };
+        $this->validate($rules);
+
+        $project = $this->project;
+        $actor = Auth::user();
+
+        try {
+            if ($this->newType === 'file') {
+                /** @var UploadedFile $file */
+                $file = $this->newFile;
+                app(AssetUploader::class)->store($file, $project, null, $actor);
+            } else {
+                $type = ContextItemType::from($this->newType);
+                $metadata = $type === ContextItemType::Text
+                    ? ['body' => $this->newBody]
+                    : ['url' => $this->newUrl];
+
+                app(ContextItemWriter::class)->createProjectItem($project, [
+                    'type' => $type,
+                    'title' => $this->newTitle,
+                    'metadata' => $metadata,
+                ], $actor);
+            }
+        } catch (InvalidArgumentException $e) {
+            // AssetUploader and ContextItemWriter throw InvalidArgumentException
+            // for MIME / size / type-shape violations. Surface as a form-level
+            // validation error so the user sees the message instead of a 500.
+            $this->addError('newFile', $e->getMessage());
+
+            return;
+        }
+
+        $this->reset(['newTitle', 'newBody', 'newUrl', 'newFile']);
+        $this->newType = 'text';
+        unset($this->items);
+    }
+
+    public function startEdit(int $itemId): void
+    {
+        $this->ensureMember();
+        $item = $this->itemFor($itemId);
+
+        $this->editingId = $item->id;
+        $this->editTitle = (string) $item->title;
+        $this->editBody = (string) ($item->metadata['body'] ?? '');
+    }
+
+    public function cancelEdit(): void
+    {
+        $this->editingId = null;
+        $this->editTitle = '';
+        $this->editBody = '';
+        $this->resetErrorBag();
+    }
+
+    public function saveEdit(): void
+    {
+        $this->ensureMember();
+        if ($this->editingId === null) {
+            return;
+        }
+
+        $item = $this->itemFor($this->editingId);
+
+        $rules = ['editTitle' => 'required|string|max:255'];
+        if ($item->type !== ContextItemType::File) {
+            $rules['editBody'] = 'nullable|string|max:10000';
+        }
+        $this->validate($rules);
+
+        $changes = ['title' => $this->editTitle];
+        if ($item->type === ContextItemType::Text) {
+            $changes['metadata'] = ['body' => $this->editBody];
+        }
+
+        app(ContextItemWriter::class)->update($item, $changes, Auth::user());
+
+        $this->cancelEdit();
+        unset($this->items);
+    }
+
+    public function delete(int $itemId): void
+    {
+        $this->ensureMember();
+        $item = $this->itemFor($itemId);
+
+        app(ContextItemWriter::class)->delete($item, Auth::user());
+
+        unset($this->items);
+    }
+
+    private function itemFor(int $itemId): ContextItem
+    {
+        $project = $this->project;
+        abort_unless($project, 404);
+
+        $item = ContextItem::query()
+            ->where('project_id', $project->id)
+            ->whereNull('story_id')
+            ->find($itemId);
+        abort_unless($item, 404);
+
+        return $item;
+    }
+
+    private function ensureMember(): void
+    {
+        $user = Auth::user();
+        abort_unless(
+            in_array((int) $this->project_id, $user->accessibleProjectIds(), true),
+            403,
+        );
+    }
+}; ?>
+
+<section data-section="project-assets" class="flex flex-col gap-4">
+    <div class="flex items-center justify-between">
+        <flux:heading size="lg">{{ __('Assets') }}</flux:heading>
+        <flux:text size="sm" class="text-zinc-500">
+            {{ __('Reference material for AI plan generation. Project assets are shared across all stories in this project.') }}
+        </flux:text>
+    </div>
+
+    <div data-section="project-assets-create" class="flex flex-col gap-2 rounded-md border border-zinc-200 p-4 dark:border-zinc-800">
+        <flux:heading size="sm">{{ __('Add asset') }}</flux:heading>
+        <flux:select wire:model.live="newType" :label="__('Type')">
+            <flux:select.option value="text">{{ __('Text note') }}</flux:select.option>
+            <flux:select.option value="link">{{ __('Link') }}</flux:select.option>
+            <flux:select.option value="file">{{ __('File') }}</flux:select.option>
+        </flux:select>
+        <flux:input wire:model="newTitle" :label="__('Title')" required />
+
+        @if ($newType === 'text')
+            <flux:textarea wire:model="newBody" :label="__('Body')" rows="4" required />
+        @elseif ($newType === 'link')
+            <flux:input wire:model="newUrl" :label="__('URL')" type="url" required />
+        @elseif ($newType === 'file')
+            <flux:field>
+                <flux:label>{{ __('File') }}</flux:label>
+                <input type="file" wire:model="newFile" class="text-sm" />
+                <flux:error name="newFile" />
+            </flux:field>
+        @endif
+
+        <div>
+            <flux:button wire:click="create" variant="primary">{{ __('Add') }}</flux:button>
+        </div>
+    </div>
+
+    <div data-section="project-assets-list" class="flex flex-col gap-2">
+        @forelse ($this->items as $item)
+            <div data-asset-id="{{ $item->id }}" class="flex flex-col gap-2 rounded-md border border-zinc-200 p-3 dark:border-zinc-800">
+                @if ($editingId === $item->id)
+                    <flux:input wire:model="editTitle" :label="__('Title')" required />
+                    @if ($item->type === \App\Enums\ContextItemType::Text)
+                        <flux:textarea wire:model="editBody" :label="__('Body')" rows="4" />
+                    @endif
+                    <div class="flex gap-2">
+                        <flux:button wire:click="saveEdit" variant="primary" size="sm">{{ __('Save') }}</flux:button>
+                        <flux:button wire:click="cancelEdit" variant="ghost" size="sm">{{ __('Cancel') }}</flux:button>
+                    </div>
+                @else
+                    <div class="flex items-start justify-between gap-2">
+                        <div class="flex min-w-0 flex-col">
+                            <flux:text class="font-medium">{{ $item->title }}</flux:text>
+                            <flux:text size="xs" class="text-zinc-500">{{ $item->type->value }}</flux:text>
+                            @if ($item->type === \App\Enums\ContextItemType::Link && filled($item->metadata['url'] ?? null))
+                                <a href="{{ $item->metadata['url'] }}" target="_blank" rel="noopener noreferrer" class="truncate text-xs text-blue-600 hover:underline dark:text-blue-400">
+                                    {{ $item->metadata['url'] }}
+                                </a>
+                            @elseif ($item->type === \App\Enums\ContextItemType::File && filled($item->metadata['original_name'] ?? null))
+                                <flux:text size="xs" class="text-zinc-500">{{ $item->metadata['original_name'] }}</flux:text>
+                            @endif
+                        </div>
+                        <div class="flex shrink-0 gap-2">
+                            <flux:button wire:click="startEdit({{ $item->id }})" size="xs" icon="pencil-square">{{ __('Edit') }}</flux:button>
+                            <flux:button wire:click="delete({{ $item->id }})" size="xs" variant="danger" icon="trash">{{ __('Delete') }}</flux:button>
+                        </div>
+                    </div>
+                @endif
+            </div>
+        @empty
+            <flux:text class="text-zinc-500">{{ __('No assets yet.') }}</flux:text>
+        @endforelse
+    </div>
+</section>
diff --git "a/resources/views/pages/context-items/\342\232\241story-assets-panel.blade.php" "b/resources/views/pages/context-items/\342\232\241story-assets-panel.blade.php"
new file mode 100644
index 0000000..e7be3aa
--- /dev/null
+++ "b/resources/views/pages/context-items/\342\232\241story-assets-panel.blade.php"
@@ -0,0 +1,272 @@
+<?php
+
+use App\Enums\ContextItemType;
+use App\Models\ContextItem;
+use App\Models\Story;
+use App\Services\Context\AssetUploader;
+use App\Services\Context\ContextItemWriter;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Auth;
+use Livewire\Attributes\Computed;
+use Livewire\Attributes\Validate;
+use Livewire\Component;
+use Livewire\WithFileUploads;
+
+new class extends Component {
+    use WithFileUploads;
+
+    public int $story_id;
+
+    #[Validate('required|in:text,link,file')]
+    public string $newType = 'text';
+
+    #[Validate('required|string|max:255')]
+    public string $newTitle = '';
+
+    #[Validate('nullable|string|max:10000')]
+    public string $newBody = '';
+
+    #[Validate('nullable|url')]
+    public string $newUrl = '';
+
+    public mixed $newFile = null;
+
+    public ?int $editingId = null;
+
+    #[Validate('required|string|max:255')]
+    public string $editTitle = '';
+
+    #[Validate('nullable|string|max:10000')]
+    public string $editBody = '';
+
+    public function mount(int $storyId): void
+    {
+        $this->story_id = $storyId;
+        $this->ensureMember();
+    }
+
+    #[Computed]
+    public function story(): ?Story
+    {
+        $story = Story::query()->with('feature')->find($this->story_id);
+
+        if ($story === null) {
+            return null;
+        }
+
+        $projectId = (int) ($story->feature?->project_id ?? 0);
+        if (! in_array($projectId, Auth::user()->accessibleProjectIds(), true)) {
+            return null;
+        }
+
+        return $story;
+    }
+
+    #[Computed]
+    public function items()
+    {
+        $story = $this->story;
+
+        return $story === null ? collect() : $story->ownedContextItems()->orderByDesc('id')->get();
+    }
+
+    public function create(): void
+    {
+        $this->ensureMember();
+
+        $rules = ['newType' => 'required|in:text,link,file', 'newTitle' => 'required|string|max:255'];
+        match ($this->newType) {
+            'text' => $rules['newBody'] = 'required|string|max:10000',
+            'link' => $rules['newUrl'] = 'required|url',
+            'file' => $rules['newFile'] = 'required|file',
+        };
+        $this->validate($rules);
+
+        $story = $this->story;
+        $project = $story->feature->project;
+        $actor = Auth::user();
+
+        try {
+            if ($this->newType === 'file') {
+                /** @var UploadedFile $file */
+                $file = $this->newFile;
+                app(AssetUploader::class)->store($file, $project, $story, $actor);
+            } else {
+                $type = ContextItemType::from($this->newType);
+                $metadata = $type === ContextItemType::Text
+                    ? ['body' => $this->newBody]
+                    : ['url' => $this->newUrl];
+
+                app(ContextItemWriter::class)->createStoryItem($story, [
+                    'type' => $type,
+                    'title' => $this->newTitle,
+                    'metadata' => $metadata,
+                ], $actor);
+            }
+        } catch (InvalidArgumentException $e) {
+            // AssetUploader and ContextItemWriter throw InvalidArgumentException
+            // for MIME / size / type-shape violations. Surface as a form-level
+            // validation error so the user sees the message instead of a 500.
+            $this->addError('newFile', $e->getMessage());
+
+            return;
+        }
+
+        $this->reset(['newTitle', 'newBody', 'newUrl', 'newFile']);
+        $this->newType = 'text';
+        unset($this->items);
+    }
+
+    public function startEdit(int $itemId): void
+    {
+        $this->ensureMember();
+        $item = $this->itemFor($itemId);
+
+        $this->editingId = $item->id;
+        $this->editTitle = (string) $item->title;
+        $this->editBody = (string) ($item->metadata['body'] ?? '');
+    }
+
+    public function cancelEdit(): void
+    {
+        $this->editingId = null;
+        $this->editTitle = '';
+        $this->editBody = '';
+        $this->resetErrorBag();
+    }
+
+    public function saveEdit(): void
+    {
+        $this->ensureMember();
+        if ($this->editingId === null) {
+            return;
+        }
+
+        $item = $this->itemFor($this->editingId);
+
+        $rules = ['editTitle' => 'required|string|max:255'];
+        if ($item->type !== ContextItemType::File) {
+            $rules['editBody'] = 'nullable|string|max:10000';
+        }
+        $this->validate($rules);
+
+        $changes = ['title' => $this->editTitle];
+        if ($item->type === ContextItemType::Text) {
+            $changes['metadata'] = ['body' => $this->editBody];
+        }
+
+        app(ContextItemWriter::class)->update($item, $changes, Auth::user());
+
+        $this->cancelEdit();
+        unset($this->items);
+    }
+
+    public function delete(int $itemId): void
+    {
+        $this->ensureMember();
+        $item = $this->itemFor($itemId);
+
+        app(ContextItemWriter::class)->delete($item, Auth::user());
+
+        unset($this->items);
+    }
+
+    private function itemFor(int $itemId): ContextItem
+    {
+        $story = $this->story;
+        abort_unless($story, 404);
+
+        $item = ContextItem::query()
+            ->where('story_id', $story->id)
+            ->find($itemId);
+        abort_unless($item, 404);
+
+        return $item;
+    }
+
+    private function ensureMember(): void
+    {
+        $story = Story::query()->with('feature')->find($this->story_id);
+        abort_unless($story, 404);
+
+        $projectId = (int) ($story->feature?->project_id ?? 0);
+        abort_unless(
+            in_array($projectId, Auth::user()->accessibleProjectIds(), true),
+            403,
+        );
+    }
+}; ?>
+
+<section data-section="story-assets" class="flex flex-col gap-4">
+    <div class="flex items-center justify-between">
+        <flux:heading size="lg">{{ __('Story-only assets') }}</flux:heading>
+    </div>
+    <flux:callout color="amber" icon="exclamation-triangle">
+        <flux:callout.text>
+            {{ __('Adding, editing, or removing story-scoped assets reopens this Story for approval.') }}
+        </flux:callout.text>
+    </flux:callout>
+
+    <div data-section="story-assets-create" class="flex flex-col gap-2 rounded-md border border-zinc-200 p-4 dark:border-zinc-800">
+        <flux:heading size="sm">{{ __('Add asset') }}</flux:heading>
+        <flux:select wire:model.live="newType" :label="__('Type')">
+            <flux:select.option value="text">{{ __('Text note') }}</flux:select.option>
+            <flux:select.option value="link">{{ __('Link') }}</flux:select.option>
+            <flux:select.option value="file">{{ __('File') }}</flux:select.option>
+        </flux:select>
+        <flux:input wire:model="newTitle" :label="__('Title')" required />
+
+        @if ($newType === 'text')
+            <flux:textarea wire:model="newBody" :label="__('Body')" rows="4" required />
+        @elseif ($newType === 'link')
+            <flux:input wire:model="newUrl" :label="__('URL')" type="url" required />
+        @elseif ($newType === 'file')
+            <flux:field>
+                <flux:label>{{ __('File') }}</flux:label>
+                <input type="file" wire:model="newFile" class="text-sm" />
+                <flux:error name="newFile" />
+            </flux:field>
+        @endif
+
+        <div>
+            <flux:button wire:click="create" variant="primary">{{ __('Add') }}</flux:button>
+        </div>
+    </div>
+
+    <div data-section="story-assets-list" class="flex flex-col gap-2">
+        @forelse ($this->items as $item)
+            <div data-asset-id="{{ $item->id }}" class="flex flex-col gap-2 rounded-md border border-zinc-200 p-3 dark:border-zinc-800">
+                @if ($editingId === $item->id)
+                    <flux:input wire:model="editTitle" :label="__('Title')" required />
+                    @if ($item->type === \App\Enums\ContextItemType::Text)
+                        <flux:textarea wire:model="editBody" :label="__('Body')" rows="4" />
+                    @endif
+                    <div class="flex gap-2">
+                        <flux:button wire:click="saveEdit" variant="primary" size="sm">{{ __('Save') }}</flux:button>
+                        <flux:button wire:click="cancelEdit" variant="ghost" size="sm">{{ __('Cancel') }}</flux:button>
+                    </div>
+                @else
+                    <div class="flex items-start justify-between gap-2">
+                        <div class="flex min-w-0 flex-col">
+                            <flux:text class="font-medium">{{ $item->title }}</flux:text>
+                            <flux:text size="xs" class="text-zinc-500">{{ $item->type->value }}</flux:text>
+                            @if ($item->type === \App\Enums\ContextItemType::Link && filled($item->metadata['url'] ?? null))
+                                <a href="{{ $item->metadata['url'] }}" target="_blank" rel="noopener noreferrer" class="truncate text-xs text-blue-600 hover:underline dark:text-blue-400">
+                                    {{ $item->metadata['url'] }}
+                                </a>
+                            @elseif ($item->type === \App\Enums\ContextItemType::File && filled($item->metadata['original_name'] ?? null))
+                                <flux:text size="xs" class="text-zinc-500">{{ $item->metadata['original_name'] }}</flux:text>
+                            @endif
+                        </div>
+                        <div class="flex shrink-0 gap-2">
+                            <flux:button wire:click="startEdit({{ $item->id }})" size="xs" icon="pencil-square">{{ __('Edit') }}</flux:button>
+                            <flux:button wire:click="delete({{ $item->id }})" size="xs" variant="danger" icon="trash">{{ __('Delete') }}</flux:button>
+                        </div>
+                    </div>
+                @endif
+            </div>
+        @empty
+            <flux:text class="text-zinc-500">{{ __('No story-only assets yet.') }}</flux:text>
+        @endforelse
+    </div>
+</section>
diff --git "a/resources/views/pages/context-items/\342\232\241story-context-picker.blade.php" "b/resources/views/pages/context-items/\342\232\241story-context-picker.blade.php"
new file mode 100644
index 0000000..71ba2a2
--- /dev/null
+++ "b/resources/views/pages/context-items/\342\232\241story-context-picker.blade.php"
@@ -0,0 +1,136 @@
+<?php
+
+use App\Models\Story;
+use App\Services\Context\ContextItemSelector;
+use Illuminate\Support\Facades\Auth;
+use Livewire\Attributes\Computed;
+use Livewire\Component;
+
+new class extends Component {
+    public int $story_id;
+
+    /** @var array<int, int> Project-scoped item IDs the user has checked in the picker. */
+    public array $selected = [];
+
+    public function mount(int $storyId): void
+    {
+        $this->story_id = $storyId;
+        $this->ensureMember();
+        $this->selected = $this->currentProjectScopedIds();
+    }
+
+    #[Computed]
+    public function story(): ?Story
+    {
+        $story = Story::query()->with('feature')->find($this->story_id);
+        if ($story === null) {
+            return null;
+        }
+
+        $projectId = (int) ($story->feature?->project_id ?? 0);
+        if (! in_array($projectId, Auth::user()->accessibleProjectIds(), true)) {
+            return null;
+        }
+
+        return $story;
+    }
+
+    #[Computed]
+    public function available()
+    {
+        $story = $this->story;
+
+        return $story === null ? collect() : $story->availableContextItems()->orderByDesc('id')->get();
+    }
+
+    public function save(): void
+    {
+        $this->ensureMember();
+
+        $story = $this->story;
+        abort_unless($story, 404);
+
+        // Story-scoped items aren't toggleable via the picker; bulkSet
+        // explicitly only manages project-scoped IDs. Filter before passing.
+        $projectScopedIds = $this->available
+            ->whereNull('story_id')
+            ->pluck('id')
+            ->map(fn ($id) => (int) $id)
+            ->all();
+
+        $desired = array_values(array_intersect(
+            array_map('intval', $this->selected),
+            $projectScopedIds,
+        ));
+
+        app(ContextItemSelector::class)->bulkSet($story, $desired, Auth::user());
+
+        $this->selected = $this->currentProjectScopedIds();
+        unset($this->available);
+    }
+
+    /**
+     * @return list<int>
+     */
+    private function currentProjectScopedIds(): array
+    {
+        $story = $this->story;
+        if ($story === null) {
+            return [];
+        }
+
+        return $story->includedContextItems()
+            ->whereNull('context_items.story_id')
+            ->pluck('context_items.id')
+            ->map(fn ($id) => (int) $id)
+            ->all();
+    }
+
+    private function ensureMember(): void
+    {
+        $story = Story::query()->with('feature')->find($this->story_id);
+        abort_unless($story, 404);
+
+        $projectId = (int) ($story->feature?->project_id ?? 0);
+        abort_unless(
+            in_array($projectId, Auth::user()->accessibleProjectIds(), true),
+            403,
+        );
+    }
+}; ?>
+
+<section data-section="story-context-picker" class="flex flex-col gap-4">
+    <div class="flex items-center justify-between">
+        <flux:heading size="lg">{{ __('AI context selection') }}</flux:heading>
+    </div>
+    <flux:callout color="amber" icon="exclamation-triangle">
+        <flux:callout.text>
+            {{ __('Toggling selection reopens this Story for approval. Save once you are done.') }}
+        </flux:callout.text>
+    </flux:callout>
+
+    <div class="flex flex-col gap-2">
+        @forelse ($this->available as $item)
+            @php $isStoryScoped = $item->story_id !== null; @endphp
+            <label data-asset-id="{{ $item->id }}" class="flex items-start gap-3 rounded-md border border-zinc-200 p-3 dark:border-zinc-800">
+                @if ($isStoryScoped)
+                    <input type="checkbox" checked disabled class="mt-1" />
+                @else
+                    <input type="checkbox" wire:model="selected" value="{{ $item->id }}" class="mt-1" />
+                @endif
+                <div class="flex flex-col">
+                    <flux:text class="font-medium">{{ $item->title }}</flux:text>
+                    <flux:text size="xs" class="text-zinc-500">
+                        {{ $item->type->value }}{{ $isStoryScoped ? ' · '.__('story-scoped (auto-included)') : '' }}
+                    </flux:text>
+                </div>
+            </label>
+        @empty
+            <flux:text class="text-zinc-500">{{ __('No context assets available for this project yet.') }}</flux:text>
+        @endforelse
+    </div>
+
+    <div>
+        <flux:button wire:click="save" variant="primary">{{ __('Save selection') }}</flux:button>
+    </div>
+</section>
diff --git "a/resources/views/pages/projects/\342\232\241show.blade.php" "b/resources/views/pages/projects/\342\232\241show.blade.php"
index 579f8d9..d50214d 100644
--- "a/resources/views/pages/projects/\342\232\241show.blade.php"
+++ "b/resources/views/pages/projects/\342\232\241show.blade.php"
@@ -280,6 +280,11 @@ class="flex flex-none cursor-grab items-center text-zinc-400 hover:text-zinc-600
             </div>
         </section>
 
+        <livewire:pages::context-items.project-assets-panel
+            :project-id="$this->project->id"
+            :key="'project-assets-panel-'.$this->project->id"
+        />
+
         @if ($canManageFeatures)
             <flux:modal name="new-feature-modal" class="md:w-96">
                 <form wire:submit.prevent="createFeature" class="flex flex-col gap-4">
diff --git "a/resources/views/pages/stories/\342\232\241show.blade.php" "b/resources/views/pages/stories/\342\232\241show.blade.php"
index c5efe10..efdeb95 100644
--- "a/resources/views/pages/stories/\342\232\241show.blade.php"
+++ "b/resources/views/pages/stories/\342\232\241show.blade.php"
@@ -707,6 +707,17 @@ class="flex p-6"
         @endunless
 
         @unless ($editing)
+            {{-- ── AI context: per-story assets + picker over project assets ── --}}
+            <livewire:pages::context-items.story-context-picker
+                :story-id="$story->id"
+                :key="'story-context-picker-'.$story->id"
+            />
+
+            <livewire:pages::context-items.story-assets-panel
+                :story-id="$story->id"
+                :key="'story-assets-panel-'.$story->id"
+            />
+
             {{-- ── Plan: ACs → Tasks → Subtasks → runs (AC-led) ────────────── --}}
             @include('partials.story-show.plan', $this->planViewData)
         @endunless
diff --git a/tests/Feature/ContextItem/Livewire/ProjectAssetsPanelTest.php b/tests/Feature/ContextItem/Livewire/ProjectAssetsPanelTest.php
new file mode 100644
index 0000000..0c69261
--- /dev/null
+++ b/tests/Feature/ContextItem/Livewire/ProjectAssetsPanelTest.php
@@ -0,0 +1,153 @@
+<?php
+
+use App\Enums\ContextItemSummaryStatus;
+use App\Enums\ContextItemType;
+use App\Models\ContextItem;
+use App\Models\Feature;
+use App\Models\Project;
+use App\Models\Story;
+use App\Models\Team;
+use App\Models\User;
+use App\Models\Workspace;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
+use Livewire\Livewire;
+
+function panelScene(): array
+{
+    $workspace = Workspace::factory()->create();
+    $team = Team::factory()->for($workspace)->create();
+    $project = Project::factory()->for($team)->create();
+
+    $member = User::factory()->create();
+    $team->addMember($member);
+    $member->forceFill(['current_team_id' => $team->id, 'current_project_id' => $project->id])->save();
+
+    return [$project, $member, $team];
+}
+
+test('panel renders existing project items and skips story-scoped ones', function () {
+    [$project, $member] = panelScene();
+    ContextItem::factory()->for($project)->forText('shown')->create(['title' => 'Shown']);
+    $feature = Feature::factory()->for($project)->create();
+    $story = Story::factory()->for($feature)->create();
+    ContextItem::factory()->for($project)->for($story)->forText('hidden')->create(['title' => 'Hidden']);
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.project-assets-panel', ['projectId' => $project->id])
+        ->assertSee('Shown')
+        ->assertDontSee('Hidden');
+});
+
+test('non-member cannot mount the panel', function () {
+    [$project] = panelScene();
+    $outsider = User::factory()->create();
+
+    Livewire::actingAs($outsider)
+        ->test('pages::context-items.project-assets-panel', ['projectId' => $project->id])
+        ->assertStatus(403);
+});
+
+test('create text item persists project-scoped row with summary_status set by writer', function () {
+    [$project, $member] = panelScene();
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.project-assets-panel', ['projectId' => $project->id])
+        ->set('newType', 'text')
+        ->set('newTitle', 'Style guide')
+        ->set('newBody', 'Use Oxford commas.')
+        ->call('create')
+        ->assertHasNoErrors();
+
+    $item = $project->contextItems()->first();
+    expect($item->title)->toBe('Style guide');
+    expect($item->type)->toBe(ContextItemType::Text);
+    expect($item->story_id)->toBeNull();
+    // Short body: writer marks Skipped (under threshold).
+    expect($item->summary_status)->toBe(ContextItemSummaryStatus::Skipped);
+});
+
+test('create link item stores url in metadata', function () {
+    [$project, $member] = panelScene();
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.project-assets-panel', ['projectId' => $project->id])
+        ->set('newType', 'link')
+        ->set('newTitle', 'Figma')
+        ->set('newUrl', 'https://figma.com/x')
+        ->call('create')
+        ->assertHasNoErrors();
+
+    $item = $project->contextItems()->first();
+    expect($item->type)->toBe(ContextItemType::Link);
+    expect($item->metadata['url'])->toBe('https://figma.com/x');
+});
+
+test('upload file goes through AssetUploader and lands as File item', function () {
+    Storage::fake('private');
+    [$project, $member] = panelScene();
+
+    $file = UploadedFile::fake()->create('spec.pdf', 8, 'application/pdf');
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.project-assets-panel', ['projectId' => $project->id])
+        ->set('newType', 'file')
+        ->set('newTitle', 'Spec')
+        ->set('newFile', $file)
+        ->call('create')
+        ->assertHasNoErrors();
+
+    $item = $project->contextItems()->first();
+    expect($item->type)->toBe(ContextItemType::File);
+    expect($item->metadata['disk'])->toBe('private');
+    Storage::disk('private')->assertExists($item->metadata['path']);
+});
+
+test('edit updates title and body for text items', function () {
+    [$project, $member] = panelScene();
+    $item = ContextItem::factory()->for($project)->forText('old')->create(['title' => 'Old']);
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.project-assets-panel', ['projectId' => $project->id])
+        ->call('startEdit', $item->id)
+        ->set('editTitle', 'New')
+        ->set('editBody', 'Refreshed body')
+        ->call('saveEdit')
+        ->assertHasNoErrors();
+
+    $fresh = $item->fresh();
+    expect($fresh->title)->toBe('New');
+    expect($fresh->metadata['body'])->toBe('Refreshed body');
+});
+
+test('delete removes the row', function () {
+    [$project, $member] = panelScene();
+    $item = ContextItem::factory()->for($project)->forText('x')->create();
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.project-assets-panel', ['projectId' => $project->id])
+        ->call('delete', $item->id)
+        ->assertHasNoErrors();
+
+    expect(ContextItem::query()->whereKey($item->id)->exists())->toBeFalse();
+});
+
+test('non-member cannot reach any mutation method (mount gate fires first)', function () {
+    [$project] = panelScene();
+    $item = ContextItem::factory()->for($project)->forText('x')->create();
+    $outsider = User::factory()->create();
+
+    // The component is gated at mount on `$user->accessibleProjectIds()`,
+    // so an outsider can't get a live instance to call mutations against.
+    // Verify mount blocks for each entry point a malicious request might
+    // try (initial render, attempted mutation post).
+    foreach (['create', 'delete', 'startEdit', 'saveEdit'] as $_method) {
+        Livewire::actingAs($outsider)
+            ->test('pages::context-items.project-assets-panel', ['projectId' => $project->id])
+            ->assertStatus(403);
+    }
+
+    // The pre-existing item is untouched — no Livewire instance ever
+    // bound for the outsider.
+    expect(ContextItem::query()->whereKey($item->id)->exists())->toBeTrue();
+});
diff --git a/tests/Feature/ContextItem/Livewire/StoryAssetsPanelTest.php b/tests/Feature/ContextItem/Livewire/StoryAssetsPanelTest.php
new file mode 100644
index 0000000..eab6e50
--- /dev/null
+++ b/tests/Feature/ContextItem/Livewire/StoryAssetsPanelTest.php
@@ -0,0 +1,149 @@
+<?php
+
+use App\Enums\ContextItemType;
+use App\Enums\StoryStatus;
+use App\Models\ContextItem;
+use App\Models\Feature;
+use App\Models\Project;
+use App\Models\Story;
+use App\Models\Team;
+use App\Models\User;
+use App\Models\Workspace;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
+use Livewire\Livewire;
+
+function storyPanelScene(): array
+{
+    $workspace = Workspace::factory()->create();
+    $team = Team::factory()->for($workspace)->create();
+    $project = Project::factory()->for($team)->create();
+    $feature = Feature::factory()->for($project)->create();
+    $story = Story::factory()->for($feature)->create([
+        'status' => StoryStatus::Approved,
+        'revision' => 1,
+    ]);
+
+    $member = User::factory()->create();
+    $team->addMember($member);
+
+    return [$story, $member];
+}
+
+test('panel renders only story-owned items', function () {
+    [$story, $member] = storyPanelScene();
+    $project = $story->feature->project;
+
+    $owned = ContextItem::factory()->for($project)->for($story)->forText('owned')->create(['title' => 'Owned']);
+    $shared = ContextItem::factory()->for($project)->forText('shared')->create(['title' => 'Shared']);
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.story-assets-panel', ['storyId' => $story->id])
+        ->assertSee('Owned')
+        ->assertDontSee('Shared');
+});
+
+test('non-member cannot mount the story panel', function () {
+    [$story] = storyPanelScene();
+    $outsider = User::factory()->create();
+
+    Livewire::actingAs($outsider)
+        ->test('pages::context-items.story-assets-panel', ['storyId' => $story->id])
+        ->assertStatus(403);
+});
+
+test('create story-scoped text item bumps revision (reopens approval)', function () {
+    [$story, $member] = storyPanelScene();
+    $beforeRev = $story->fresh()->revision;
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.story-assets-panel', ['storyId' => $story->id])
+        ->set('newType', 'text')
+        ->set('newTitle', 'Story note')
+        ->set('newBody', 'Hot edit')
+        ->call('create')
+        ->assertHasNoErrors();
+
+    expect($story->fresh()->revision)->toBe($beforeRev + 1);
+    expect($story->ownedContextItems()->count())->toBe(1);
+    // Auto-included into the Story's selection by ContextItemWriter::createStoryItem.
+    expect($story->includedContextItems()->count())->toBe(1);
+});
+
+test('create story-scoped link item auto-includes and bumps revision once', function () {
+    [$story, $member] = storyPanelScene();
+    $beforeRev = $story->fresh()->revision;
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.story-assets-panel', ['storyId' => $story->id])
+        ->set('newType', 'link')
+        ->set('newTitle', 'Figma')
+        ->set('newUrl', 'https://figma.com/x')
+        ->call('create')
+        ->assertHasNoErrors();
+
+    $item = $story->ownedContextItems()->first();
+    expect($item->type)->toBe(ContextItemType::Link);
+    expect($item->metadata['url'])->toBe('https://figma.com/x');
+    expect($story->fresh()->revision)->toBe($beforeRev + 1);
+    expect($story->includedContextItems()->whereKey($item->id)->exists())->toBeTrue();
+});
+
+test('upload story-scoped file persists, auto-includes, and bumps revision once', function () {
+    Storage::fake('private');
+    [$story, $member] = storyPanelScene();
+    $beforeRev = $story->fresh()->revision;
+
+    $file = UploadedFile::fake()->create('story.pdf', 8, 'application/pdf');
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.story-assets-panel', ['storyId' => $story->id])
+        ->set('newType', 'file')
+        ->set('newTitle', 'Story PDF')
+        ->set('newFile', $file)
+        ->call('create')
+        ->assertHasNoErrors();
+
+    $item = $story->ownedContextItems()->first();
+    expect($item->type)->toBe(ContextItemType::File);
+    expect($item->story_id)->toBe($story->id);
+    Storage::disk('private')->assertExists($item->metadata['path']);
+
+    // Story-scoped file uploads now follow the same contract as text/link
+    // creation: revision bumps once and the item auto-includes into the
+    // Story's selection.
+    expect($story->fresh()->revision)->toBe($beforeRev + 1);
+    expect($story->includedContextItems()->whereKey($item->id)->exists())->toBeTrue();
+});
+
+test('edit story-scoped item bumps revision', function () {
+    [$story, $member] = storyPanelScene();
+    $project = $story->feature->project;
+    $item = ContextItem::factory()->for($project)->for($story)->forText('old')->create(['title' => 'Old']);
+    $beforeRev = $story->fresh()->revision;
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.story-assets-panel', ['storyId' => $story->id])
+        ->call('startEdit', $item->id)
+        ->set('editTitle', 'New')
+        ->call('saveEdit')
+        ->assertHasNoErrors();
+
+    expect($story->fresh()->revision)->toBe($beforeRev + 1);
+    expect($item->fresh()->title)->toBe('New');
+});
+
+test('delete story-scoped item bumps revision and removes the row', function () {
+    [$story, $member] = storyPanelScene();
+    $project = $story->feature->project;
+    $item = ContextItem::factory()->for($project)->for($story)->forText('x')->create();
+    $beforeRev = $story->fresh()->revision;
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.story-assets-panel', ['storyId' => $story->id])
+        ->call('delete', $item->id)
+        ->assertHasNoErrors();
+
+    expect($story->fresh()->revision)->toBe($beforeRev + 1);
+    expect(ContextItem::query()->whereKey($item->id)->exists())->toBeFalse();
+});
diff --git a/tests/Feature/ContextItem/Livewire/StoryContextPickerTest.php b/tests/Feature/ContextItem/Livewire/StoryContextPickerTest.php
new file mode 100644
index 0000000..32bcf88
--- /dev/null
+++ b/tests/Feature/ContextItem/Livewire/StoryContextPickerTest.php
@@ -0,0 +1,120 @@
+<?php
+
+use App\Enums\StoryStatus;
+use App\Models\ContextItem;
+use App\Models\Feature;
+use App\Models\Project;
+use App\Models\Story;
+use App\Models\Team;
+use App\Models\User;
+use App\Models\Workspace;
+use Livewire\Livewire;
+
+function pickerScene(): array
+{
+    $workspace = Workspace::factory()->create();
+    $team = Team::factory()->for($workspace)->create();
+    $project = Project::factory()->for($team)->create();
+    $feature = Feature::factory()->for($project)->create();
+    $story = Story::factory()->for($feature)->create([
+        'status' => StoryStatus::Approved,
+        'revision' => 1,
+    ]);
+
+    $member = User::factory()->create();
+    $team->addMember($member);
+
+    return [$story, $member];
+}
+
+test('picker lists project-scoped + story-owned items, with story-scoped pre-checked', function () {
+    [$story, $member] = pickerScene();
+    $project = $story->feature->project;
+    $shared = ContextItem::factory()->for($project)->forText('shared')->create(['title' => 'Shared']);
+    $owned = ContextItem::factory()->for($project)->for($story)->forText('owned')->create(['title' => 'Owned']);
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.story-context-picker', ['storyId' => $story->id])
+        ->assertSee('Shared')
+        ->assertSee('Owned')
+        ->assertSee('story-scoped');
+});
+
+test('mount prefills selected with currently included project-scoped IDs only', function () {
+    [$story, $member] = pickerScene();
+    $project = $story->feature->project;
+    $a = ContextItem::factory()->for($project)->forText()->create();
+    $b = ContextItem::factory()->for($project)->forText()->create();
+    $owned = ContextItem::factory()->for($project)->for($story)->forText()->create();
+    $story->includedContextItems()->attach([$a->id, $owned->id]);
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.story-context-picker', ['storyId' => $story->id])
+        ->assertSet('selected', [$a->id]);
+});
+
+test('save bulkSets project-scoped selection and reopens approval once', function () {
+    [$story, $member] = pickerScene();
+    $project = $story->feature->project;
+    $a = ContextItem::factory()->for($project)->forText()->create();
+    $b = ContextItem::factory()->for($project)->forText()->create();
+    $story->includedContextItems()->attach([$a->id]);
+    $beforeRev = $story->fresh()->revision;
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.story-context-picker', ['storyId' => $story->id])
+        ->set('selected', [$b->id])
+        ->call('save')
+        ->assertHasNoErrors();
+
+    $included = $story->includedContextItems()->pluck('context_items.id')->sort()->values()->all();
+    expect($included)->toBe([$b->id]);
+    expect($story->fresh()->revision)->toBe($beforeRev + 1);
+});
+
+test('save is a no-op when desired set matches current — no revision bump', function () {
+    [$story, $member] = pickerScene();
+    $project = $story->feature->project;
+    $a = ContextItem::factory()->for($project)->forText()->create();
+    $story->includedContextItems()->attach([$a->id]);
+    $beforeRev = $story->fresh()->revision;
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.story-context-picker', ['storyId' => $story->id])
+        ->call('save')
+        ->assertHasNoErrors();
+
+    expect($story->fresh()->revision)->toBe($beforeRev);
+});
+
+test('save filters out story-scoped IDs that the client tampered with', function () {
+    [$story, $member] = pickerScene();
+    $project = $story->feature->project;
+    $owned = ContextItem::factory()->for($project)->for($story)->forText()->create();
+    // Production state: story-scoped items are auto-attached by
+    // ContextItemWriter::createStoryItem. Tests using factories directly
+    // need to mirror that.
+    $story->includedContextItems()->attach($owned->id);
+    $a = ContextItem::factory()->for($project)->forText()->create();
+
+    Livewire::actingAs($member)
+        ->test('pages::context-items.story-context-picker', ['storyId' => $story->id])
+        ->set('selected', [$owned->id, $a->id])
+        ->call('save')
+        ->assertHasNoErrors();
+
+    // Story-scoped item stays attached (untouched by bulkSet); project-scoped
+    // item attached fresh. Tampered-in story-scoped IDs are silently dropped
+    // by the picker before reaching the selector.
+    $included = $story->includedContextItems()->pluck('context_items.id')->sort()->values()->all();
+    expect($included)->toBe(collect([$owned->id, $a->id])->sort()->values()->all());
+});
+
+test('non-member cannot mount the picker', function () {
+    [$story] = pickerScene();
+    $outsider = User::factory()->create();
+
+    Livewire::actingAs($outsider)
+        ->test('pages::context-items.story-context-picker', ['storyId' => $story->id])
+        ->assertStatus(403);
+});
diff --git a/tests/TestCase.php b/tests/TestCase.php
index a574f37..f940f53 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -7,6 +7,18 @@
 
 abstract class TestCase extends BaseTestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // Tests don't run `npm run build`, so the Vite manifest is missing.
+        // Without this, every view that pulls in `partials/head.blade.php`
+        // 500s with `ViteManifestNotFoundException`. `withoutVite()` swaps
+        // the container binding to a stub that returns empty asset markup
+        // — view assertions stop depending on a built frontend.
+        $this->withoutVite();
+    }
+
     protected function skipUnlessFortifyHas(string $feature, ?string $message = null): void
     {
         if (! Features::enabled($feature)) {