@taskforcehq/taskforce 0.3.302 → 0.3.304

package/dist/components/features/TaskSettings.test.js

@@ -109,6 +109,17 @@ describe('TaskSettings Component', () => {
         };
         return render(_jsx(TaskSettings, { ...props }));
     };
+    const openMcpSettings = async (user) => {
+        await user.click(screen.getByRole('button', { name: /MCP/i }));
+    };
+    const openCloudMcpSettings = async (user) => {
+        await openMcpSettings(user);
+        const cloudToggle = screen.queryByRole('button', { name: 'Cloud MCP' });
+        if (cloudToggle) {
+            await user.click(cloudToggle);
+        }
+        await screen.findByText('Cloud MCP Configuration');
+    };
     const originalFetch = global.fetch;
     it('4.1 Open settings - Renders correctly', () => {
         renderComponent();
@@ -859,7 +870,7 @@ describe('TaskSettings Component', () => {
             credentials: 'include'
         }));
     }, 10000);
-    it('4.21 Local authenticated runtime defaults MCP tab to cloud with toggle', async () => {
+    it('4.21 Local authenticated runtime defaults MCP tab to local with local-first toggle', async () => {
         const fetchCloudAuthApi = vi.fn(async () => ({
             ok: true,
             json: async () => ({ items: [] })
@@ -875,15 +886,17 @@ describe('TaskSettings Component', () => {
             }
         });
         await user.click(screen.getByRole('button', { name: /MCP/i }));
-        expect(await screen.findByRole('button', { name: 'Cloud MCP' })).toBeInTheDocument();
-        expect(screen.getByRole('button', { name: 'Local MCP' })).toBeInTheDocument();
-        expect(screen.getByText('Cloud MCP Configuration')).toBeInTheDocument();
-        expect(screen.getAllByText(/https:\/\/mcp\.taskforcehq\.ai\/mcp/).length).toBeGreaterThan(0);
-        expect(screen.queryByText('MCP Path Mapping (Host Root)')).not.toBeInTheDocument();
-        await user.click(screen.getByRole('button', { name: 'Local MCP' }));
+        const localButton = await screen.findByRole('button', { name: 'Local MCP' });
+        const cloudButton = screen.getByRole('button', { name: 'Cloud MCP' });
+        expect(localButton.compareDocumentPosition(cloudButton) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();
+        expect(screen.getByText('Local MCP Configuration')).toBeInTheDocument();
+        expect(screen.queryByText('Cloud MCP Configuration')).not.toBeInTheDocument();
         expect(screen.queryByText('MCP Path Mapping (Host Root)')).not.toBeInTheDocument();
         await user.click(screen.getByRole('button', { name: 'Advanced' }));
         expect(screen.getByText('MCP Path Mapping (Host Root)')).toBeInTheDocument();
+        await user.click(cloudButton);
+        expect(screen.getByText('Cloud MCP Configuration')).toBeInTheDocument();
+        expect(screen.getAllByText(/https:\/\/mcp\.taskforcehq\.ai\/mcp/).length).toBeGreaterThan(0);
         expect(fetchCloudAuthApi).toHaveBeenCalledWith('/api/taskforce/settings/mcp/tokens', expect.objectContaining({
             method: 'GET',
             credentials: 'include'
@@ -900,7 +913,7 @@ describe('TaskSettings Component', () => {
                             id: 'mcp-token-1',
                             name: 'Workspace Alpha MCP',
                             tokenPrefix: 'tfmcp_example',
-                            scopes: ['tasks:read', 'tasks:write'],
+                            scopes: ['tasks:read', 'tasks:write', 'workspace:read'],
                             status: 'active',
                             createdAt: new Date().toISOString()
                         }
@@ -921,12 +934,19 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
-        await user.click(await screen.findByRole('button', { name: 'Generate Token' }));
+        await openCloudMcpSettings(user);
+        await user.click(screen.getByRole('button', { name: 'Generate Token' }));
         expect(fetchCloudAuthApi).toHaveBeenCalledWith('/api/taskforce/settings/mcp/tokens', expect.objectContaining({
             method: 'POST',
             credentials: 'include'
         }));
+        expect(fetchCloudAuthApi).toHaveBeenCalledWith('/api/taskforce/settings/mcp/tokens', expect.objectContaining({
+            body: JSON.stringify({
+                name: 'Workspace Alpha MCP',
+                scopes: ['tasks:read', 'tasks:write', 'workspace:read'],
+                expiresAt: null
+            })
+        }));
         expect((await screen.findAllByText('tfmcp_example_secret')).length).toBeGreaterThan(0);
     }, 10000);
     it('4.23c MCP token name defaults to the workspace name', async () => {
@@ -938,7 +958,7 @@ describe('TaskSettings Component', () => {
                 currentWorkspaceName: 'Workspace Alpha'
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         expect(await screen.findByDisplayValue('Workspace Alpha MCP')).toBeInTheDocument();
     });
     it('4.23d MCP test connection uses the provided cloud auth helper', async () => {
@@ -950,7 +970,7 @@ describe('TaskSettings Component', () => {
                         result: {
                             workspaceName: 'Workspace Alpha',
                             workspaceId: 'workspace-alpha',
-                            scopes: ['tasks:read', 'tasks:write']
+                            scopes: ['tasks:read', 'tasks:write', 'workspace:read']
                         }
                     })
                 };
@@ -969,7 +989,7 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         await user.click(screen.getByRole('button', { name: 'Test Connection' }));
         await user.type(await screen.findByPlaceholderText('tfmcp_xxxxx_replace-me'), 'tfmcp_example_secret');
         await user.click(screen.getAllByRole('button', { name: 'Test Connection' })[1]);
@@ -978,7 +998,7 @@ describe('TaskSettings Component', () => {
             credentials: 'include'
         }));
         expect(await screen.findByText('Connection looks good for this workspace.')).toBeInTheDocument();
-        expect(screen.getByText(/Granted scopes: tasks:read, tasks:write/i)).toBeInTheDocument();
+        expect(screen.getByText(/Granted scopes: tasks:read, tasks:write, workspace:read/i)).toBeInTheDocument();
     }, 10000);
     it('4.23e Antigravity uses serverUrl instead of transport in the cloud snippet', async () => {
         const fetchCloudAuthApi = vi.fn(async () => ({
@@ -995,7 +1015,7 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         await user.selectOptions(screen.getByRole('combobox', { name: 'MCP client' }), 'antigravity');
         const snippetMatches = await screen.findAllByText(/serverUrl/);
         expect(snippetMatches.length).toBeGreaterThan(0);
@@ -1018,7 +1038,7 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         expect(await screen.findByText(/https:\/\/performance-mcp\.taskforcehq\.ai\/mcp/)).toBeInTheDocument();
         expect(screen.queryByText(/https:\/\/performance-app\.taskforcehq\.ai\/mcp/)).not.toBeInTheDocument();
     }, 10000);
@@ -1038,7 +1058,7 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         expect(await screen.findByText(/https:\/\/performance-mcp\.taskforcehq\.ai\/mcp/)).toBeInTheDocument();
         expect(screen.queryByText(/https:\/\/performance-app\.taskforcehq\.ai\/mcp/)).not.toBeInTheDocument();
     }, 10000);
@@ -1057,7 +1077,7 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         const urlMatches = await screen.findAllByText(/"url"/);
         expect(urlMatches.length).toBeGreaterThan(0);
         expect(screen.getAllByText(/https:\/\/mcp\.taskforcehq\.ai\/mcp/).length).toBeGreaterThan(0);
@@ -1079,7 +1099,7 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         await user.selectOptions(screen.getByRole('combobox', { name: 'MCP client' }), 'cline');
         expect(await screen.findByText(/Cline Configuration Instructions/i)).toBeInTheDocument();
         expect(screen.getByText(/"type"/)).toBeInTheDocument();
@@ -1101,7 +1121,7 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         await user.selectOptions(screen.getByRole('combobox', { name: 'MCP client' }), 'vscode');
         expect(await screen.findByText(/VS Code Configuration Instructions/i)).toBeInTheDocument();
         expect(screen.getByText(/"servers"/)).toBeInTheDocument();
@@ -1123,7 +1143,7 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         await user.selectOptions(screen.getByRole('combobox', { name: 'MCP client' }), 'codex');
         expect((await screen.findAllByText(/\.codex\/config\.toml/i)).length).toBeGreaterThan(0);
         expect(screen.getByText(/\[mcp_servers\./)).toBeInTheDocument();
@@ -1145,7 +1165,7 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         await user.selectOptions(screen.getByRole('combobox', { name: 'MCP client' }), 'claude-code');
         expect(await screen.findByText(/Claude Code Configuration Instructions/i)).toBeInTheDocument();
         expect(screen.getByText(/claude mcp add --transport http/i)).toBeInTheDocument();
@@ -1167,7 +1187,7 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         await user.selectOptions(screen.getByRole('combobox', { name: 'MCP client' }), 'gemini-cli');
         expect(await screen.findByText(/Gemini CLI Configuration Instructions/i)).toBeInTheDocument();
         expect(screen.getByText(/gemini mcp add taskforce-/i)).toBeInTheDocument();
@@ -1190,7 +1210,7 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         await user.selectOptions(screen.getByRole('combobox', { name: 'MCP client' }), 'openclaw');
         expect(await screen.findByText(/OpenClaw Configuration Instructions/i)).toBeInTheDocument();
         expect((await screen.findAllByText(/~\/\.openclaw\/openclaw\.json/i)).length).toBeGreaterThan(0);
@@ -1217,10 +1237,10 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         expect(screen.queryByRole('option', { name: /Claude Desktop/i })).not.toBeInTheDocument();
         expect(screen.queryByRole('option', { name: /ChatGPT Desktop/i })).not.toBeInTheDocument();
-        expect(await screen.findByText('Cursor Configuration Instructions')).toBeInTheDocument();
+        expect(await screen.findByText('General MCP Configuration Instructions')).toBeInTheDocument();
     }, 10000);
     it('4.23e4b Integrations tab shows ChatGPT and Claude connector management separately from PAT tokens', async () => {
         const fetchCloudAuthApi = vi.fn(async (path) => {
@@ -1294,8 +1314,7 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
-        expect(await screen.findByText('Cloud MCP Configuration')).toBeInTheDocument();
+        await openCloudMcpSettings(user);
         expect(screen.queryByText('ChatGPT Connector')).not.toBeInTheDocument();
         expect(screen.queryByText(/^Connectors$/)).not.toBeInTheDocument();
     }, 10000);
@@ -1309,8 +1328,7 @@ describe('TaskSettings Component', () => {
                 cloudMcpBaseUrl: 'https://mcp.taskforcehq.ai',
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
-        expect(await screen.findByText('Cloud MCP Configuration')).toBeInTheDocument();
+        await openCloudMcpSettings(user);
         expect(screen.getAllByRole('button', { name: /copy/i }).length).toBeGreaterThan(0);
     }, 10000);
     it('4.23g1 Cloud MCP copy warns before a token is generated', async () => {
@@ -1323,8 +1341,7 @@ describe('TaskSettings Component', () => {
                 cloudMcpBaseUrl: 'https://mcp.taskforcehq.ai',
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
-        await screen.findByText('Cloud MCP Configuration');
+        await openCloudMcpSettings(user);
         await user.click(screen.getByTitle('Copy full configuration file'));
         expect(screen.getByText('Generate a token before copying the Cloud MCP configuration.')).toBeInTheDocument();
     }, 10000);
@@ -1338,8 +1355,7 @@ describe('TaskSettings Component', () => {
                 cloudMcpBaseUrl: 'https://mcp.taskforcehq.ai',
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
-        await screen.findByText('Cloud MCP Configuration');
+        await openCloudMcpSettings(user);
         expect(screen.queryByText('Automation Identity (Optional)')).not.toBeInTheDocument();
         expect(screen.queryByRole('combobox', { name: 'Use existing AI profile' })).not.toBeInTheDocument();
     }, 10000);
@@ -1353,8 +1369,7 @@ describe('TaskSettings Component', () => {
                 cloudMcpBaseUrl: 'https://mcp.taskforcehq.ai',
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
-        await screen.findByText('Cloud MCP Configuration');
+        await openCloudMcpSettings(user);
         await user.selectOptions(screen.getByRole('combobox', { name: 'MCP client' }), 'codex');
         expect(screen.queryByText(/X-Taskforce-AI-Name/i)).not.toBeInTheDocument();
         expect(screen.queryByText(/X-Taskforce-AI-Profile-Token/i)).not.toBeInTheDocument();
@@ -1394,7 +1409,7 @@ describe('TaskSettings Component', () => {
                 fetchCloudAuthApi
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await openCloudMcpSettings(user);
         expect(await screen.findByText('Current Token')).toBeInTheDocument();
         expect(screen.getByText('Old Token')).toBeInTheDocument();
         const tokenLabels = screen.getAllByText(/^(Current Token|Old Token)$/);
@@ -1414,8 +1429,7 @@ describe('TaskSettings Component', () => {
                 cloudMcpBaseUrl: 'https://mcp.taskforcehq.ai',
             }
         });
-        await user.click(screen.getByRole('button', { name: /MCP/i }));
-        await screen.findByText('Cloud MCP Configuration');
+        await openCloudMcpSettings(user);
         const codeNodes = Array.from(document.querySelectorAll('code'));
         const snippetNode = codeNodes.find((node) => node.textContent?.includes('"mcpServers"'));
         expect(snippetNode).toBeTruthy();
@@ -1435,11 +1449,96 @@ describe('TaskSettings Component', () => {
         });
         await user.click(screen.getByRole('button', { name: /MCP/i }));
         expect(screen.getByText('Local MCP')).toBeInTheDocument();
-        expect(screen.getByText(/Claude Code CLI, Gemini CLI/i)).toBeInTheDocument();
+        expect(screen.getByRole('combobox', { name: 'MCP client' })).toHaveValue('general');
+        expect(screen.getByText('General MCP Configuration Instructions')).toBeInTheDocument();
         expect(screen.queryByText('MCP Path Mapping (Host Root)')).not.toBeInTheDocument();
         await user.click(screen.getByRole('button', { name: 'Advanced' }));
         expect(screen.getByText('MCP Path Mapping (Host Root)')).toBeInTheDocument();
         expect(screen.queryByText('Cloud MCP Configuration')).not.toBeInTheDocument();
         expect(screen.queryByRole('button', { name: 'Cloud MCP' })).not.toBeInTheDocument();
     });
+    it('4.24a Local MCP selector offers General first and keeps the rest alphabetical', async () => {
+        const user = userEvent.setup();
+        renderComponent({
+            settingsModel: {
+                runtimeMode: 'local',
+                isAuthenticated: false
+            }
+        });
+        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        const options = screen.getAllByRole('option').map((option) => option.textContent);
+        expect(options).toEqual([
+            'General',
+            'Antigravity',
+            'Claude Code CLI',
+            'Cline',
+            'Codex',
+            'Cursor',
+            'Gemini CLI',
+            'OpenClaw',
+            'VS Code / Copilot',
+            'Windsurf'
+        ]);
+    });
+    it('4.24b Local Codex shows config.toml MCP output without token headers', async () => {
+        const user = userEvent.setup();
+        renderComponent({
+            settingsModel: {
+                runtimeMode: 'local',
+                isAuthenticated: false,
+                projectRoot: '/Users/rossburke/projects/taskforce',
+                projectName: 'taskforce',
+                tenantId: 'tenant-alpha',
+                workspaceId: 'workspace-alpha',
+                mcpScriptPath: '/usr/local/bin/taskforce'
+            }
+        });
+        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await user.selectOptions(screen.getByRole('combobox', { name: 'MCP client' }), 'codex');
+        expect(await screen.findByText(/Codex Configuration Instructions/i)).toBeInTheDocument();
+        expect((await screen.findAllByText(/\.codex\/config\.toml/i)).length).toBeGreaterThan(0);
+        expect(screen.getByText(/\[mcp_servers\./)).toBeInTheDocument();
+        expect(screen.getByText(/command = "taskforce"/i)).toBeInTheDocument();
+        expect(screen.queryByText(/Authorization/i)).not.toBeInTheDocument();
+    });
+    it('4.24c Local VS Code uses stdio config under servers', async () => {
+        const user = userEvent.setup();
+        renderComponent({
+            settingsModel: {
+                runtimeMode: 'local',
+                isAuthenticated: false,
+                projectRoot: '/Users/rossburke/projects/taskforce',
+                projectName: 'taskforce',
+                tenantId: 'tenant-alpha',
+                workspaceId: 'workspace-alpha',
+                mcpScriptPath: '/usr/local/bin/taskforce'
+            }
+        });
+        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await user.selectOptions(screen.getByRole('combobox', { name: 'MCP client' }), 'vscode');
+        expect(await screen.findByText(/VS Code Configuration Instructions/i)).toBeInTheDocument();
+        expect(screen.getByText(/"servers"/)).toBeInTheDocument();
+        expect(screen.getByText(/"type"/)).toBeInTheDocument();
+        expect(screen.getByText(/"stdio"/)).toBeInTheDocument();
+    });
+    it('4.24d Local Claude Code shows a stdio add command', async () => {
+        const user = userEvent.setup();
+        renderComponent({
+            settingsModel: {
+                runtimeMode: 'local',
+                isAuthenticated: false,
+                projectRoot: '/Users/rossburke/projects/taskforce',
+                projectName: 'taskforce',
+                tenantId: 'tenant-alpha',
+                workspaceId: 'workspace-alpha',
+                mcpScriptPath: '/usr/local/bin/taskforce'
+            }
+        });
+        await user.click(screen.getByRole('button', { name: /MCP/i }));
+        await user.selectOptions(screen.getByRole('combobox', { name: 'MCP client' }), 'claude-code');
+        expect(await screen.findByText(/Claude Code Configuration Instructions/i)).toBeInTheDocument();
+        expect(screen.getByText(/claude mcp add taskforce-/i)).toBeInTheDocument();
+        expect(screen.getByText(/--env TASKFORCE_TENANT_ID=tenant-alpha/i)).toBeInTheDocument();
+        expect(screen.getByText(/-- taskforce mcp/i)).toBeInTheDocument();
+    });
 });

package/dist/components/task/TaskActionHeader.d.ts

@@ -23,8 +23,9 @@ interface TaskActionHeaderProps {
     handleToggleCancel: (task: TaskItem) => void;
     handleSetStatus?: (task: TaskItem, status: TaskStatus) => void;
     handleArchiveTask: (task: TaskItem) => void;
+    handleUnarchiveTask?: (taskId: string) => void;
     handleRestoreDeletedTask?: (deletedRecordId: string) => void;
     handlePermanentlyDeleteDeletedTask?: (deletedRecordId: string) => void;
 }
-export declare function TaskActionHeader({ editingTaskId, loading, autoSaveState, title, handleSubmit, resetForm, handleCopyId, copiedId, tasks, currentTask: currentTaskProp, currentTaskWorkstream, currentTaskInitiative, workstreamInput, onWorkstreamInputChange, onSetWorkstreamForCurrentTask, handleToggleInProgress, handleToggleReview, handleToggleComplete, handleToggleCancel, handleSetStatus, handleArchiveTask, handleRestoreDeletedTask, handlePermanentlyDeleteDeletedTask }: TaskActionHeaderProps): import("react/jsx-runtime").JSX.Element;
+export declare function TaskActionHeader({ editingTaskId, loading, autoSaveState, title, handleSubmit, resetForm, handleCopyId, copiedId, tasks, currentTask: currentTaskProp, currentTaskWorkstream, currentTaskInitiative, workstreamInput, onWorkstreamInputChange, onSetWorkstreamForCurrentTask, handleToggleInProgress, handleToggleReview, handleToggleComplete, handleToggleCancel, handleSetStatus, handleArchiveTask, handleUnarchiveTask, handleRestoreDeletedTask, handlePermanentlyDeleteDeletedTask }: TaskActionHeaderProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/task/TaskActionHeader.js

@@ -7,7 +7,7 @@ import { TaskStatusActions } from './TaskStatusActions';
 import { getTaskReferenceDisplayState } from '../../utils/taskReferences';
 import { TaskReferenceBadge } from './TaskReferenceBadge';
 import { formatInitiativeReference, getWorkstreamReferenceLabel } from '../../utils/planningReferences';
-export function TaskActionHeader({ editingTaskId, loading, autoSaveState = 'idle', title, handleSubmit, resetForm, handleCopyId, copiedId, tasks, currentTask: currentTaskProp, currentTaskWorkstream, currentTaskInitiative, workstreamInput = '', onWorkstreamInputChange, onSetWorkstreamForCurrentTask, handleToggleInProgress, handleToggleReview, handleToggleComplete, handleToggleCancel, handleSetStatus, handleArchiveTask, handleRestoreDeletedTask, handlePermanentlyDeleteDeletedTask }) {
+export function TaskActionHeader({ editingTaskId, loading, autoSaveState = 'idle', title, handleSubmit, resetForm, handleCopyId, copiedId, tasks, currentTask: currentTaskProp, currentTaskWorkstream, currentTaskInitiative, workstreamInput = '', onWorkstreamInputChange, onSetWorkstreamForCurrentTask, handleToggleInProgress, handleToggleReview, handleToggleComplete, handleToggleCancel, handleSetStatus, handleArchiveTask, handleUnarchiveTask, handleRestoreDeletedTask, handlePermanentlyDeleteDeletedTask }) {
     const [showWorkstreamEditor, setShowWorkstreamEditor] = React.useState(false);
     const currentTask = currentTaskProp ?? (editingTaskId ? tasks.find(t => t.id === editingTaskId) || null : null);
     const isArchivedReadOnly = Boolean(currentTask?.isArchived);
@@ -48,7 +48,7 @@ export function TaskActionHeader({ editingTaskId, loading, autoSaveState = 'idle
                                     } }), _jsx("button", { type: "button", className: "tf-control-icon tf-control-icon-compact", onClick: handleWorkstreamConfirm, disabled: !workstreamInput.trim() || loading, title: "Attach workstream", "aria-label": "Attach workstream", children: _jsx(Check, { size: 14 }) }), _jsx("button", { type: "button", className: "tf-control-icon tf-control-icon-compact", onClick: () => {
                                         onWorkstreamInputChange?.('');
                                         setShowWorkstreamEditor(false);
-                                    }, disabled: loading, title: "Cancel workstream attach", "aria-label": "Cancel workstream attach", children: _jsx(X, { size: 14 }) })] })) : null] }), _jsx("div", { className: styles.taskSaveStatusCenter, children: _jsx("div", { className: `${styles.taskSaveStatus} ${autoSaveState === 'error' ? styles.taskSaveStatusError : ''}`, "aria-live": "polite", children: autoSaveState === 'saving' ? (_jsxs(_Fragment, { children: [_jsx(Loader2, { size: 14, className: styles.spinner }), _jsx("span", { children: "Saving\u2026" })] })) : autoSaveState === 'saved' ? (_jsx("span", { children: "Saved" })) : autoSaveState === 'error' ? (_jsx("span", { children: "Save failed" })) : null }) }), _jsx("div", { className: styles.editActionsGroup, children: isDeletedReadOnly && currentTask?.deletedRecordId ? (_jsxs(_Fragment, { children: [handleRestoreDeletedTask && (_jsx("button", { type: "button", className: styles.actionBtn, onClick: () => handleRestoreDeletedTask(currentTask.deletedRecordId || ''), disabled: loading, title: "Restore deleted task", children: _jsx(RotateCcw, { size: 16 }) })), handlePermanentlyDeleteDeletedTask && (_jsx("button", { type: "button", className: `${styles.actionBtn} ${styles.deleteBtn}`, onClick: () => handlePermanentlyDeleteDeletedTask(currentTask.deletedRecordId || ''), disabled: loading, title: "Permanently delete deleted task", children: _jsx(Trash2, { size: 16 }) }))] })) : (_jsx(TaskStatusActions, { task: currentTask, disabled: loading || isArchivedReadOnly, onSetStatus: (task, status) => {
+                                    }, disabled: loading, title: "Cancel workstream attach", "aria-label": "Cancel workstream attach", children: _jsx(X, { size: 14 }) })] })) : null] }), _jsx("div", { className: styles.taskSaveStatusCenter, children: _jsx("div", { className: `${styles.taskSaveStatus} ${autoSaveState === 'error' ? styles.taskSaveStatusError : ''}`, "aria-live": "polite", children: autoSaveState === 'saving' ? (_jsxs(_Fragment, { children: [_jsx(Loader2, { size: 14, className: styles.spinner }), _jsx("span", { children: "Saving\u2026" })] })) : autoSaveState === 'saved' ? (_jsx("span", { children: "Saved" })) : autoSaveState === 'error' ? (_jsx("span", { children: "Save failed" })) : null }) }), _jsx("div", { className: styles.editActionsGroup, children: isDeletedReadOnly && currentTask?.deletedRecordId ? (_jsxs(_Fragment, { children: [handleRestoreDeletedTask && (_jsx("button", { type: "button", className: styles.actionBtn, onClick: () => handleRestoreDeletedTask(currentTask.deletedRecordId || ''), disabled: loading, title: "Restore deleted task", children: _jsx(RotateCcw, { size: 16 }) })), handlePermanentlyDeleteDeletedTask && (_jsx("button", { type: "button", className: `${styles.actionBtn} ${styles.deleteBtn}`, onClick: () => handlePermanentlyDeleteDeletedTask(currentTask.deletedRecordId || ''), disabled: loading, title: "Permanently delete deleted task", children: _jsx(Trash2, { size: 16 }) }))] })) : (_jsx(TaskStatusActions, { task: currentTask, disabled: loading, statusDisabled: loading || isArchivedReadOnly, archiveActionMode: isArchivedReadOnly ? 'unarchive' : 'auto', onSetStatus: (task, status) => {
                             if (handleSetStatus) {
                                 handleSetStatus(task, status);
                                 return;
@@ -68,5 +68,5 @@ export function TaskActionHeader({ editingTaskId, loading, autoSaveState = 'idle
                             if (status === 'cancelled') {
                                 handleToggleCancel(task);
                             }
-                        }, onArchiveTask: handleArchiveTask })) })] })) : (_jsxs(_Fragment, { children: [_jsxs("button", { type: "button", onClick: resetForm, disabled: loading, className: styles.secondaryHeaderBtn, title: t('actionHeader.clearFormTitle'), children: [_jsx(RotateCcw, { size: 16 }), t('actionHeader.clear')] }), _jsxs("button", { type: "button", onClick: (e) => handleSubmit(e), disabled: loading || !title.trim(), className: styles.primaryUpdateBtn, title: t('actionHeader.addTaskTitle'), children: [loading ? _jsx(Loader2, { size: 16, className: styles.spinner }) : _jsx(Plus, { size: 16 }), t('actionHeader.addTask')] })] })) }));
+                        }, onArchiveTask: handleArchiveTask, onUnarchiveTask: (task) => handleUnarchiveTask?.(task.id) })) })] })) : (_jsxs(_Fragment, { children: [_jsxs("button", { type: "button", onClick: resetForm, disabled: loading, className: styles.secondaryHeaderBtn, title: t('actionHeader.clearFormTitle'), children: [_jsx(RotateCcw, { size: 16 }), t('actionHeader.clear')] }), _jsxs("button", { type: "button", onClick: (e) => handleSubmit(e), disabled: loading || !title.trim(), className: styles.primaryUpdateBtn, title: t('actionHeader.addTaskTitle'), children: [loading ? _jsx(Loader2, { size: 16, className: styles.spinner }) : _jsx(Plus, { size: 16 }), t('actionHeader.addTask')] })] })) }));
 }

package/dist/components/task/TaskActionHeader.test.js

@@ -70,4 +70,12 @@ describe('TaskActionHeader', () => {
         await user.click(screen.getByRole('button', { name: /cancel workstream attach/i }));
         expect(onWorkstreamInputChange).toHaveBeenCalledWith('');
     });
+    it('shows an unarchive action for archived tasks and wires it to the task id', async () => {
+        const user = userEvent.setup();
+        const handleUnarchiveTask = vi.fn();
+        render(_jsx(TaskActionHeader, { ...baseProps, editingTaskId: "task-1", title: "Polish task modal", currentTask: { ...baseTask, status: 'done', isArchived: true }, handleUnarchiveTask: handleUnarchiveTask }));
+        expect(screen.queryByRole('button', { name: /^Archive task$/i })).not.toBeInTheDocument();
+        await user.click(screen.getByRole('button', { name: /unarchive task/i }));
+        expect(handleUnarchiveTask).toHaveBeenCalledWith('task-1');
+    });
 });

package/dist/components/task/TaskCard.js

@@ -54,7 +54,22 @@ const TaskCardInner = ({ task, searchQuery = '', copiedId = null, taxonomies = [
     const latestActivity = React.useMemo(() => getLatestTaskActivity(task), [task]);
     const resolvedReadOnlyMode = readOnlyMode || (task.isDeleted ? 'deleted' : (isArchived ? 'archived' : null));
     const isReadOnly = resolvedReadOnlyMode !== null;
-    const latestActivityText = React.useMemo(() => summarizeTaskActivity(latestActivity), [latestActivity]);
+    const formatActivityFieldValue = React.useCallback((field, value) => {
+        const normalizedValue = String(value || '').trim();
+        if (!normalizedValue)
+            return undefined;
+        if (field === 'assignee') {
+            return getAssigneeLabel(normalizedValue, assigneeOptions);
+        }
+        if (field === 'workstreamId' && normalizedValue === taskWorkstream?.id) {
+            return workstreamReferenceLabel || taskWorkstream.id;
+        }
+        if (field === 'initiativeId' && normalizedValue === taskInitiative?.id) {
+            return initiativeReferenceLabel || taskInitiative.id;
+        }
+        return undefined;
+    }, [assigneeOptions, initiativeReferenceLabel, taskInitiative, taskWorkstream, workstreamReferenceLabel]);
+    const latestActivityText = React.useMemo(() => summarizeTaskActivity(latestActivity, formatActivityFieldValue), [formatActivityFieldValue, latestActivity]);
     const activityCount = Array.isArray(task.activity) && task.activity.length > 0
         ? task.activity.length
         : (task.comments?.length || 0);

package/dist/components/task/TaskCard.test.js

@@ -108,6 +108,37 @@ describe('TaskCard parent/child progress', () => {
         expect(screen.getByText(/Status: task -> review/)).toBeInTheDocument();
         expect(screen.getByTitle('2 activity items')).toBeInTheDocument();
     });
+    it('uses the current workstream reference in latest activity summaries', () => {
+        const task = baseTask({
+            id: 'task-relationship-summary',
+            title: 'Relationship summary task',
+            workstreamId: 'workstream-1',
+            activity: [
+                {
+                    id: 'event:event-relationship-1',
+                    type: 'event',
+                    timestamp: '2026-03-22T10:00:00.000Z',
+                    event: {
+                        id: 'event-relationship-1',
+                        taskId: 'task-relationship-summary',
+                        workspaceId: 'default',
+                        action: 'task-relationship-changed',
+                        actor: 'user',
+                        actorType: 'human',
+                        createdAt: '2026-03-22T10:00:00.000Z',
+                        details: {
+                            changes: {
+                                workstreamId: { from: null, to: 'workstream-1' }
+                            }
+                        }
+                    }
+                }
+            ]
+        });
+        render(_jsx(TaskCard, { task: task, taskWorkstream: baseWorkstream({ id: 'workstream-1', referenceNumber: 12 }), onClick: () => { }, onCopyId: () => { } }));
+        expect(screen.getByText(/Workstream: none -> WS-12/)).toBeInTheDocument();
+        expect(screen.queryByText(/workstream-1/i)).not.toBeInTheDocument();
+    });
     it('renders named AI assignee labels from assignee options', () => {
         const task = baseTask({
             id: 'task-ai-assignee',

package/dist/components/task/TaskForm.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { TaskItem, CategoryConfig, Comment, AttachmentItem, TaskAssignee, ChecklistItem } from '../../types';
+import type { TaskItem, CategoryConfig, Comment, AttachmentItem, TaskAssignee, ChecklistItem, InitiativeItem } from '../../types';
 import type { TaxonomyDefinition } from '../../types';
 import { type TaskAssigneeOption } from '../../utils/assignees';
 import type { WorkstreamItem } from '../../types';
@@ -58,6 +58,7 @@ interface TaskFormProps {
     assigneeOptions: TaskAssigneeOption[];
     taxonomies: TaxonomyDefinition[];
     workstreams?: WorkstreamItem[];
+    initiatives?: InitiativeItem[];
     copiedId: string | null;
     onTitleChange: (value: string) => void;
     onDescriptionChange: (value: string) => void;

package/dist/components/task/TaskForm.js

@@ -19,7 +19,7 @@ import { summarizeTaskChange, summarizeTaskEvent } from '../../utils/taskActivit
 import { ensureAssigneeOptionPresent, getAssigneeKind, getAssigneeLabel, } from '../../utils/assignees';
 import { getTaskReferenceLabel } from '../../utils/taskReferences';
 import { getVisibleTaskFormTaxonomies } from '../../utils/taxonomyFormDefaults.js';
-import { getWorkstreamReferenceLabel } from '../../utils/planningReferences';
+import { getInitiativeReferenceLabel, getWorkstreamReferenceLabel } from '../../utils/planningReferences';
 function SortableChecklistRow({ id, item, onToggle, onRemove }) {
     const { attributes, listeners, setNodeRef, transform, transition, isDragging, } = useSortable({ id });
     const style = {
@@ -36,7 +36,7 @@ function hexToRgba(hex, opacity) {
     return `rgba(${parseInt(result[1], 16)}, ${parseInt(result[2], 16)}, ${parseInt(result[3], 16)}, ${opacity})`;
 }
 export function TaskForm(props) {
-    const { editingTaskId, error, title, description, category, type, priority, complexity, manualComplexityEnabled = false, assignee, scheduledDate, dueDate, workstreamInput = '', checklistItems, comments, newCommentText, contextFiles, currentWorkspaceId, apiBaseUrl, descriptionFocused, showMarkdownHelp, showChecklist = false, checklistEnabled = true, showComments, formTaxonomies, onTaxonomyChange, onOpenSettings, categories, types, priorities, taxonomyDisplayLabels, assigneeOptions, taxonomies, workstreams = [], copiedId, onTitleChange, onDescriptionChange, onCategoryChange, onTypeChange, onPriorityChange, onComplexityChange, onAssigneeChange, onScheduledDateChange, onDueDateChange, onWorkstreamInputChange = () => { }, onChecklistItemsChange, onNewCommentTextChange, onDescriptionFocusedChange, onShowMarkdownHelpChange, onShowChecklistChange = () => { }, onShowCommentsChange, onSubmit, onAddComment, onAddContextFile, onRemoveContextFile, onUpdateContextCaption, onCopyId, onToggleInProgress, onToggleReview, onToggleComplete, onToggleCancel, onSetStatus, onArchiveTask, onUnarchive, onOpenTaskById, currentTask, commentsEndRef, } = props;
+    const { editingTaskId, error, title, description, category, type, priority, complexity, manualComplexityEnabled = false, assignee, scheduledDate, dueDate, workstreamInput = '', checklistItems, comments, newCommentText, contextFiles, currentWorkspaceId, apiBaseUrl, descriptionFocused, showMarkdownHelp, showChecklist = false, checklistEnabled = true, showComments, formTaxonomies, onTaxonomyChange, onOpenSettings, categories, types, priorities, taxonomyDisplayLabels, assigneeOptions, taxonomies, workstreams = [], initiatives = [], copiedId, onTitleChange, onDescriptionChange, onCategoryChange, onTypeChange, onPriorityChange, onComplexityChange, onAssigneeChange, onScheduledDateChange, onDueDateChange, onWorkstreamInputChange = () => { }, onChecklistItemsChange, onNewCommentTextChange, onDescriptionFocusedChange, onShowMarkdownHelpChange, onShowChecklistChange = () => { }, onShowCommentsChange, onSubmit, onAddComment, onAddContextFile, onRemoveContextFile, onUpdateContextCaption, onCopyId, onToggleInProgress, onToggleReview, onToggleComplete, onToggleCancel, onSetStatus, onArchiveTask, onUnarchive, onOpenTaskById, currentTask, commentsEndRef, } = props;
     const currentTaskReferenceLabel = getTaskReferenceLabel(currentTask);
     const visibleTaxonomies = React.useMemo(() => getVisibleTaskFormTaxonomies(taxonomies, formTaxonomies), [taxonomies, formTaxonomies]);
     const categoryOptions = React.useMemo(() => {
@@ -215,6 +215,14 @@ export function TaskForm(props) {
         ].filter(Boolean);
         return new Map(entries.map((actor) => [String(actor.id), actor]));
     }, [currentTask?.assigneeActor, currentTask?.createdByActor]);
+    const workstreamLabelById = React.useMemo(() => new Map(workstreams.map((workstream) => [
+        workstream.id,
+        getWorkstreamReferenceLabel(workstream) || workstream.id,
+    ])), [workstreams]);
+    const initiativeLabelById = React.useMemo(() => new Map(initiatives.map((initiative) => [
+        initiative.id,
+        getInitiativeReferenceLabel(initiative) || initiative.id,
+    ])), [initiatives]);
     const taskActivityItems = React.useMemo(() => {
         if (Array.isArray(currentTask?.activity) && currentTask.activity.length > 0) {
             return currentTask.activity;
@@ -227,9 +235,19 @@ export function TaskForm(props) {
         }));
     }, [comments, currentTask?.activity]);
     const formatActivityFieldValue = (field, value) => {
-        if (field !== 'assignee')
+        const normalizedValue = String(value || '').trim();
+        if (!normalizedValue)
             return undefined;
-        return getAssigneeLabel(String(value || '').trim(), resolvedAssigneeOptions);
+        if (field === 'assignee') {
+            return getAssigneeLabel(normalizedValue, resolvedAssigneeOptions);
+        }
+        if (field === 'workstreamId') {
+            return workstreamLabelById.get(normalizedValue);
+        }
+        if (field === 'initiativeId') {
+            return initiativeLabelById.get(normalizedValue);
+        }
+        return undefined;
     };
     const resolveActorLabel = React.useCallback((actorId, actorType, actorLabel) => {
         if (actorLabel && actorLabel.trim())

package/dist/components/task/TaskForm.test.js

@@ -59,6 +59,16 @@ describe('TaskForm Component', () => {
                 createdAt: '2026-04-03T00:00:00.000Z',
             },
         ],
+        initiatives: [
+            {
+                id: 'initiative-1',
+                referenceNumber: 3,
+                referenceLabel: 'IN-3',
+                title: 'Execution model',
+                description: null,
+                createdAt: '2026-04-03T00:00:00.000Z',
+            },
+        ],
         copiedId: null,
         // Callbacks
         onTitleChange: vi.fn(),
@@ -400,6 +410,42 @@ describe('TaskForm Component', () => {
         expect(screen.getByText('ASSIGNED TO: Unassigned -> Planner Bot')).toBeInTheDocument();
         expect(screen.queryByText(/ai-profile-1/i)).not.toBeInTheDocument();
     });
+    it('renders planning relationship audit activity with reference labels instead of raw ids', () => {
+        renderForm({
+            editingTaskId: '123',
+            showComments: true,
+            currentTask: {
+                id: '123',
+                title: 'Existing Task',
+                activity: [
+                    {
+                        id: 'event:task-event-relationship',
+                        type: 'event',
+                        timestamp: '2026-03-23T12:00:00.000Z',
+                        event: {
+                            id: 'task-event-relationship',
+                            taskId: '123',
+                            workspaceId: 'workspace-1',
+                            action: 'task-relationship-changed',
+                            actor: 'member-1',
+                            actorType: 'human',
+                            createdAt: '2026-03-23T12:00:00.000Z',
+                            details: {
+                                changes: {
+                                    workstreamId: {
+                                        from: null,
+                                        to: 'workstream-1',
+                                    },
+                                },
+                            },
+                        },
+                    },
+                ],
+            },
+        });
+        expect(screen.getByText('Workstream: none -> WS-12')).toBeInTheDocument();
+        expect(screen.queryByText(/workstream-1/i)).not.toBeInTheDocument();
+    });
     it('3.13 Update title', async () => {
         const user = userEvent.setup();
         renderForm({ editingTaskId: '123', title: 'Old Title' });