@fixy/core 0.0.0

package/dist/turn.d.ts

@@ -0,0 +1,20 @@
+import type { FixyThread } from './thread.js';
+import type { AdapterRegistry } from './registry.js';
+import type { LocalThreadStore } from './store.js';
+import { WorktreeManager } from './worktree.js';
+export interface TurnParams {
+    thread: FixyThread;
+    input: string;
+    registry: AdapterRegistry;
+    store: LocalThreadStore;
+    onLog: (stream: 'stdout' | 'stderr', chunk: string) => void;
+    signal: AbortSignal;
+    worktreeManager?: WorktreeManager;
+}
+export declare class TurnController {
+    runTurn(params: TurnParams): Promise<void>;
+    private _findLastAgentId;
+    private _dispatchToAdapter;
+    private _appendSystemMessage;
+}
+//# sourceMappingURL=turn.d.ts.map

package/dist/turn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn.d.ts","sourceRoot":"","sources":["../src/turn.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAe,UAAU,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,eAAe,CAAC;IAC1B,KAAK,EAAE,gBAAgB,CAAC;IACxB,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,GAAG,QAAQ,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D,MAAM,EAAE,WAAW,CAAC;IACpB,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,qBAAa,cAAc;IACnB,OAAO,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAsEhD,OAAO,CAAC,gBAAgB;YAUV,kBAAkB;YA+ClB,oBAAoB;CAcnC"}

package/dist/turn.js

@@ -0,0 +1,130 @@
+// packages/core/src/turn.ts
+import { randomUUID } from 'node:crypto';
+import { Router } from './router.js';
+import { FixyCommandRunner } from './fixy-commands.js';
+import { WorktreeManager } from './worktree.js';
+export class TurnController {
+    async runTurn(params) {
+        const { thread, input, store } = params;
+        const router = new Router(params.registry);
+        const parsed = router.parse(input);
+        let dispatchedTo;
+        if (parsed.kind === 'mention') {
+            dispatchedTo = parsed.agentIds;
+        }
+        else if (parsed.kind === 'bare') {
+            const lastAgent = this._findLastAgentId(thread);
+            dispatchedTo = [lastAgent ?? thread.workerModel];
+        }
+        else {
+            dispatchedTo = [];
+        }
+        const userMsg = {
+            id: randomUUID(),
+            createdAt: new Date().toISOString(),
+            role: 'user',
+            agentId: null,
+            content: input,
+            runId: null,
+            dispatchedTo,
+            patches: [],
+            warnings: [],
+        };
+        await store.appendMessage(thread.id, thread.projectRoot, userMsg);
+        switch (parsed.kind) {
+            case 'mention': {
+                if (parsed.agentIds.length > 3) {
+                    await this._appendSystemMessage('maximum 3 adapters per turn', params);
+                    return;
+                }
+                for (const agentId of parsed.agentIds) {
+                    await this._dispatchToAdapter(agentId, parsed.body, params);
+                }
+                break;
+            }
+            case 'fixy': {
+                const runner = new FixyCommandRunner();
+                await runner.run({
+                    thread: params.thread,
+                    rest: parsed.rest,
+                    store: params.store,
+                    registry: params.registry,
+                    worktreeManager: params.worktreeManager ?? new WorktreeManager(),
+                    onLog: params.onLog,
+                    signal: params.signal,
+                });
+                break;
+            }
+            case 'bare': {
+                const lastAgent = this._findLastAgentId(thread);
+                const resolvedAgentId = lastAgent ?? thread.workerModel;
+                await this._dispatchToAdapter(resolvedAgentId, parsed.body, params);
+                break;
+            }
+            case 'error': {
+                await this._appendSystemMessage(parsed.reason, params);
+                break;
+            }
+        }
+    }
+    _findLastAgentId(thread) {
+        for (let i = thread.messages.length - 1; i >= 0; i--) {
+            const msg = thread.messages[i];
+            if (msg.role === 'agent' && msg.agentId !== null) {
+                return msg.agentId;
+            }
+        }
+        return null;
+    }
+    async _dispatchToAdapter(agentId, body, params) {
+        const freshThread = await params.store.getThread(params.thread.id, params.thread.projectRoot);
+        const adapter = params.registry.require(agentId);
+        const runId = randomUUID();
+        const ctx = {
+            runId,
+            agent: { id: adapter.id, name: adapter.name },
+            threadContext: {
+                threadId: freshThread.id,
+                projectRoot: freshThread.projectRoot,
+                worktreePath: freshThread.projectRoot,
+                repoRef: null,
+            },
+            messages: freshThread.messages,
+            prompt: body,
+            session: freshThread.agentSessions[agentId] ?? null,
+            onLog: params.onLog,
+            onMeta: () => { },
+            onSpawn: () => { },
+            signal: params.signal,
+        };
+        const result = await adapter.execute(ctx);
+        const agentMsg = {
+            id: randomUUID(),
+            createdAt: new Date().toISOString(),
+            role: 'agent',
+            agentId: adapter.id,
+            content: result.summary,
+            runId,
+            dispatchedTo: [],
+            patches: result.patches,
+            warnings: result.warnings,
+        };
+        await params.store.appendMessage(params.thread.id, params.thread.projectRoot, agentMsg);
+        params.thread.agentSessions[agentId] = result.session;
+    }
+    async _appendSystemMessage(content, params) {
+        const msg = {
+            id: randomUUID(),
+            createdAt: new Date().toISOString(),
+            role: 'system',
+            agentId: null,
+            content,
+            runId: null,
+            dispatchedTo: [],
+            patches: [],
+            warnings: [],
+        };
+        await params.store.appendMessage(params.thread.id, params.thread.projectRoot, msg);
+    }
+}
+//# sourceMappingURL=turn.js.map

package/dist/turn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn.js","sourceRoot":"","sources":["../src/turn.ts"],"names":[],"mappings":"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"}

package/dist/worktree.d.ts

@@ -0,0 +1,36 @@
+import type { FixyPatch } from './thread.js';
+export interface WorktreeHandle {
+    /** Absolute path to the worktree directory. */
+    path: string;
+    /** Branch name, e.g. "fixy/<threadId>-<agentId>" */
+    branch: string;
+    agentId: string;
+    threadId: string;
+}
+export declare class WorktreeManager {
+    #private;
+    /**
+     * Idempotent — returns an existing worktree handle or creates a new one.
+     */
+    ensure(projectRoot: string, threadId: string, agentId: string): Promise<WorktreeHandle>;
+    /**
+     * Runs `git diff --no-color` in the worktree and parses the output into
+     * FixyPatch objects.  Returns an empty array when there are no changes.
+     */
+    collectPatches(handle: WorktreeHandle): Promise<FixyPatch[]>;
+    /**
+     * Removes the worktree and its branch, then re-provisions a fresh one.
+     */
+    reset(handle: WorktreeHandle, projectRoot: string): Promise<void>;
+    /**
+     * Permanently removes the worktree and its tracking branch.
+     * Does NOT re-provision.
+     */
+    remove(handle: WorktreeHandle, projectRoot: string): Promise<void>;
+    /**
+     * Lists all WorktreeHandles for the given threadId by reading the worktrees
+     * directory on disk.  Returns an empty array when no worktrees exist yet.
+     */
+    list(threadId: string): Promise<WorktreeHandle[]>;
+}
+//# sourceMappingURL=worktree.d.ts.map

package/dist/worktree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../src/worktree.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAI7C,MAAM,WAAW,cAAc;IAC7B,+CAA+C;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,eAAe;;IAC1B;;OAEG;IACG,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAmB7F;;;OAGG;IACG,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAUlE;;OAEG;IACG,KAAK,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvE;;;OAGG;IACG,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxE;;;OAGG;IACG,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAuCxD"}

package/dist/worktree.js

@@ -0,0 +1,91 @@
+// packages/core/src/worktree.ts
+import { execFile } from 'node:child_process';
+import { access, mkdir, readdir } from 'node:fs/promises';
+import { dirname, join } from 'node:path';
+import { promisify } from 'node:util';
+import { parseUnifiedDiff } from './diff-parser.js';
+import { getWorktreesDir } from './paths.js';
+const execFileAsync = promisify(execFile);
+export class WorktreeManager {
+    /**
+     * Idempotent — returns an existing worktree handle or creates a new one.
+     */
+    async ensure(projectRoot, threadId, agentId) {
+        const worktreePath = join(getWorktreesDir(threadId), agentId);
+        const branch = `fixy/${threadId}-${agentId}`;
+        const exists = await this.#pathExists(worktreePath);
+        if (!exists) {
+            // Ensure parent directories exist before running git worktree add.
+            // git worktree add creates the leaf directory itself — only create the parent.
+            await mkdir(dirname(worktreePath), { recursive: true });
+            await execFileAsync('git', ['worktree', 'add', worktreePath, '-b', branch], {
+                cwd: projectRoot,
+            });
+        }
+        return { path: worktreePath, branch, agentId, threadId };
+    }
+    /**
+     * Runs `git diff --no-color` in the worktree and parses the output into
+     * FixyPatch objects.  Returns an empty array when there are no changes.
+     */
+    async collectPatches(handle) {
+        const { stdout } = await execFileAsync('git', ['diff', '--no-color'], { cwd: handle.path });
+        if (!stdout || stdout.trim().length === 0) {
+            return [];
+        }
+        return parseUnifiedDiff(stdout, handle.path);
+    }
+    /**
+     * Removes the worktree and its branch, then re-provisions a fresh one.
+     */
+    async reset(handle, projectRoot) {
+        await this.#removeWorktree(handle, projectRoot);
+        await this.ensure(projectRoot, handle.threadId, handle.agentId);
+    }
+    /**
+     * Permanently removes the worktree and its tracking branch.
+     * Does NOT re-provision.
+     */
+    async remove(handle, projectRoot) {
+        await this.#removeWorktree(handle, projectRoot);
+    }
+    /**
+     * Lists all WorktreeHandles for the given threadId by reading the worktrees
+     * directory on disk.  Returns an empty array when no worktrees exist yet.
+     */
+    async list(threadId) {
+        const dir = getWorktreesDir(threadId);
+        const dirExists = await this.#pathExists(dir);
+        if (!dirExists) {
+            return [];
+        }
+        const entries = await readdir(dir, { withFileTypes: true });
+        return entries
+            .filter((e) => e.isDirectory())
+            .map((e) => ({
+            path: join(dir, e.name),
+            branch: `fixy/${threadId}-${e.name}`,
+            agentId: e.name,
+            threadId,
+        }));
+    }
+    // ---------------------------------------------------------------------------
+    // Private helpers
+    // ---------------------------------------------------------------------------
+    async #removeWorktree(handle, projectRoot) {
+        await execFileAsync('git', ['worktree', 'remove', '--force', handle.path], {
+            cwd: projectRoot,
+        });
+        await execFileAsync('git', ['branch', '-D', handle.branch], { cwd: projectRoot });
+    }
+    async #pathExists(p) {
+        try {
+            await access(p);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+}
+//# sourceMappingURL=worktree.js.map

package/dist/worktree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree.js","sourceRoot":"","sources":["../src/worktree.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -0,0 +1,21 @@
+{
+  "name": "@fixy/core",
+  "version": "0.0.0",
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
+  "scripts": {
+    "build": "tsc",
+    "typecheck": "tsc --noEmit"
+  },
+  "devDependencies": {
+    "@types/node": "^20.0.0"
+  },
+  "license": "MIT"
+}

package/src/__tests__/diff-parser.test.ts

@@ -0,0 +1,99 @@
+// packages/core/src/__tests__/diff-parser.test.ts
+import { describe, it, expect } from 'vitest';
+import { parseUnifiedDiff } from '../diff-parser.js';
+
+describe('parseUnifiedDiff', () => {
+  it('parses a single file diff correctly', () => {
+    const diff = `diff --git a/src/index.ts b/src/index.ts
+index abc1234..def5678 100644
+--- a/src/index.ts
++++ b/src/index.ts
+@@ -1,3 +1,4 @@
+ import { foo } from './foo';
++import { bar } from './bar';
+
+ export function main() {
+-  return foo();
++  return bar(foo());
+ }
+`;
+    const patches = parseUnifiedDiff(diff, '/tmp/worktree');
+
+    expect(patches).toHaveLength(1);
+    expect(patches[0].relativePath).toBe('src/index.ts');
+    expect(patches[0].filePath).toBe('/tmp/worktree/src/index.ts');
+    expect(patches[0].stats.additions).toBe(2);
+    expect(patches[0].stats.deletions).toBe(1);
+  });
+
+  it('parses a multi-file diff correctly', () => {
+    const diff = `diff --git a/file1.ts b/file1.ts
+index abc..def 100644
+--- a/file1.ts
++++ b/file1.ts
+@@ -1,2 +1,3 @@
+ const a = 1;
++const b = 2;
+ export { a };
+diff --git a/src/file2.ts b/src/file2.ts
+index 111..222 100644
+--- a/src/file2.ts
++++ b/src/file2.ts
+@@ -1,3 +1,2 @@
+ const x = 1;
+-const y = 2;
+ export { x };
+`;
+    const patches = parseUnifiedDiff(diff, '/tmp/worktree');
+
+    expect(patches).toHaveLength(2);
+
+    expect(patches[0].relativePath).toBe('file1.ts');
+    expect(patches[0].stats.additions).toBe(1);
+    expect(patches[0].stats.deletions).toBe(0);
+
+    expect(patches[1].relativePath).toBe('src/file2.ts');
+    expect(patches[1].stats.additions).toBe(0);
+    expect(patches[1].stats.deletions).toBe(1);
+  });
+
+  it('returns an empty array for an empty diff', () => {
+    expect(parseUnifiedDiff('', '/tmp/worktree')).toEqual([]);
+    expect(parseUnifiedDiff('   \n  \n', '/tmp/worktree')).toEqual([]);
+  });
+
+  it('parses a new file diff with only additions', () => {
+    const diff = `diff --git a/new-file.ts b/new-file.ts
+new file mode 100644
+index 0000000..abc1234
+--- /dev/null
++++ b/new-file.ts
+@@ -0,0 +1,3 @@
++const a = 1;
++const b = 2;
++export { a, b };
+`;
+    const patches = parseUnifiedDiff(diff, '/tmp/worktree');
+
+    expect(patches).toHaveLength(1);
+    expect(patches[0].stats.additions).toBe(3);
+    expect(patches[0].stats.deletions).toBe(0);
+  });
+
+  it('parses a deleted file diff with only deletions', () => {
+    const diff = `diff --git a/removed.ts b/removed.ts
+deleted file mode 100644
+index abc1234..0000000
+--- a/removed.ts
++++ /dev/null
+@@ -1,2 +0,0 @@
+-const old = true;
+-export { old };
+`;
+    const patches = parseUnifiedDiff(diff, '/tmp/worktree');
+
+    expect(patches).toHaveLength(1);
+    expect(patches[0].stats.additions).toBe(0);
+    expect(patches[0].stats.deletions).toBe(2);
+  });
+});

package/src/__tests__/fixy-commands.test.ts

@@ -0,0 +1,231 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { FixyCommandRunner } from '../fixy-commands.js';
+import type { FixyCommandContext } from '../fixy-commands.js';
+import { AdapterRegistry } from '../registry.js';
+import { LocalThreadStore } from '../store.js';
+import type { WorktreeManager } from '../worktree.js';
+import type { FixyAdapter, FixyExecutionContext, FixyExecutionResult } from '../adapter.js';
+import type { FixyThread } from '../thread.js';
+import { getThreadFile } from '../paths.js';
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+function createStubAdapter(
+  id: string,
+  name: string,
+  executeFn?: (ctx: FixyExecutionContext) => Promise<FixyExecutionResult>,
+): FixyAdapter {
+  return {
+    id,
+    name,
+    probe: async () => ({
+      available: true,
+      version: '1.0.0',
+      authStatus: 'ok' as const,
+      detail: null,
+    }),
+    execute:
+      executeFn ??
+      (async () => ({
+        exitCode: 0,
+        signal: null,
+        timedOut: false,
+        summary: `response from ${id}`,
+        session: null,
+        patches: [],
+        warnings: [],
+        errorMessage: null,
+      })),
+  };
+}
+
+const stubWorktreeManager = {
+  ensure: vi.fn(async () => ({ path: '', branch: '', agentId: '', threadId: '' })),
+  collectPatches: vi.fn(async () => []),
+  reset: vi.fn(async () => {}),
+  remove: vi.fn(async () => {}),
+  list: vi.fn(async () => []),
+} as unknown as WorktreeManager;
+
+// ---------------------------------------------------------------------------
+// Suite
+// ---------------------------------------------------------------------------
+
+describe('FixyCommandRunner', () => {
+  let tmpDir: string;
+  let store: LocalThreadStore;
+  let thread: FixyThread;
+  let registry: AdapterRegistry;
+  let runner: FixyCommandRunner;
+
+  beforeEach(async () => {
+    tmpDir = await mkdtemp(join(tmpdir(), 'fixy-cmd-test-'));
+    process.env['FIXY_HOME'] = tmpDir;
+    store = new LocalThreadStore();
+    await store.init();
+    thread = await store.createThread('/tmp/fake-project');
+    registry = new AdapterRegistry();
+    runner = new FixyCommandRunner();
+
+    // Reset all vi.fn() call history between tests
+    vi.clearAllMocks();
+  });
+
+  afterEach(async () => {
+    delete process.env['FIXY_HOME'];
+    await rm(tmpDir, { recursive: true, force: true });
+  });
+
+  function makeCtx(overrides?: Partial<FixyCommandContext>): FixyCommandContext {
+    return {
+      thread,
+      rest: '',
+      store,
+      registry,
+      worktreeManager: stubWorktreeManager,
+      onLog: () => {},
+      signal: AbortSignal.timeout(5000),
+      ...overrides,
+    };
+  }
+
+  // -------------------------------------------------------------------------
+  // Test 1: /worker <id> — persists workerModel change
+  // -------------------------------------------------------------------------
+  it('/worker codex — persists workerModel change and appends system message', async () => {
+    registry.register(createStubAdapter('claude', 'Claude'));
+    registry.register(createStubAdapter('codex', 'Codex'));
+
+    expect(thread.workerModel).toBe('claude');
+
+    await runner.run(makeCtx({ rest: '/worker codex' }));
+
+    const fresh = await store.getThread(thread.id, thread.projectRoot);
+    expect(fresh.workerModel).toBe('codex');
+
+    const sysMsg = fresh.messages.find(
+      (m) => m.role === 'system' && m.content === 'worker set to codex',
+    );
+    expect(sysMsg).toBeDefined();
+  });
+
+  // -------------------------------------------------------------------------
+  // Test 2: /worker unknown — throws for unknown adapter
+  // -------------------------------------------------------------------------
+  it('/worker unknown — throws for unknown adapter', async () => {
+    registry.register(createStubAdapter('claude', 'Claude'));
+
+    await expect(runner.run(makeCtx({ rest: '/worker unknown' }))).rejects.toThrow(
+      /Unknown adapter/,
+    );
+  });
+
+  // -------------------------------------------------------------------------
+  // Test 3: /all build something — returns stub message
+  // -------------------------------------------------------------------------
+  it('/all build something — returns stub collaboration message', async () => {
+    await runner.run(makeCtx({ rest: '/all build something' }));
+
+    const fresh = await store.getThread(thread.id, thread.projectRoot);
+    const sysMsg = fresh.messages.find(
+      (m) => m.role === 'system' && m.content.includes('collaboration engine not yet implemented'),
+    );
+    expect(sysMsg).toBeDefined();
+  });
+
+  // -------------------------------------------------------------------------
+  // Test 4: /settings — returns stub message
+  // -------------------------------------------------------------------------
+  it('/settings — returns stub message', async () => {
+    await runner.run(makeCtx({ rest: '/settings' }));
+
+    const fresh = await store.getThread(thread.id, thread.projectRoot);
+    const sysMsg = fresh.messages.find(
+      (m) => m.role === 'system' && m.content === 'settings command not yet implemented',
+    );
+    expect(sysMsg).toBeDefined();
+  });
+
+  // -------------------------------------------------------------------------
+  // Test 5: /reset — clears agentSessions
+  // -------------------------------------------------------------------------
+  it('/reset — clears agentSessions and appends confirmation message', async () => {
+    // Mutate the in-memory thread to have an active session.
+    thread.agentSessions = { claude: { sessionId: 'sess-1', params: {} } };
+    thread.worktrees = { claude: '/tmp/worktree-claude' };
+
+    // Persist the modified thread to disk so store.getThread returns it.
+    const threadFilePath = getThreadFile(thread.projectRoot, thread.id);
+    await writeFile(threadFilePath, JSON.stringify(thread, null, 2), 'utf8');
+
+    await runner.run(makeCtx({ rest: '/reset' }));
+
+    const fresh = await store.getThread(thread.id, thread.projectRoot);
+    expect(fresh.agentSessions).toEqual({});
+
+    const sysMsg = fresh.messages.find(
+      (m) => m.role === 'system' && m.content.includes('thread reset'),
+    );
+    expect(sysMsg).toBeDefined();
+
+    // Verify worktreeManager.reset was called for the claude worktree entry.
+    expect(stubWorktreeManager.reset as ReturnType<typeof vi.fn>).toHaveBeenCalledOnce();
+  });
+
+  // -------------------------------------------------------------------------
+  // Test 6: /status — shows adapter probe results
+  // -------------------------------------------------------------------------
+  it('/status — lists adapter probe results including current workerModel', async () => {
+    registry.register(createStubAdapter('claude', 'Claude'));
+    registry.register(createStubAdapter('codex', 'Codex'));
+
+    await runner.run(makeCtx({ rest: '/status' }));
+
+    const fresh = await store.getThread(thread.id, thread.projectRoot);
+    expect(fresh.messages.length).toBeGreaterThan(0);
+
+    const sysMsg = fresh.messages[fresh.messages.length - 1];
+    expect(sysMsg?.role).toBe('system');
+
+    const content = sysMsg?.content ?? '';
+    expect(content).toContain('claude');
+    expect(content).toContain('codex');
+    expect(content).toContain('yes'); // available: yes
+    expect(content).toContain('1.0.0'); // version
+    expect(content).toContain(thread.workerModel); // current workerModel line
+  });
+
+  // -------------------------------------------------------------------------
+  // Test 7: Bare @fixy prompt — routes through worker adapter
+  // -------------------------------------------------------------------------
+  it('bare prompt — routes through worker adapter and appends agent message with agentId=fixy', async () => {
+    const customExecute = async (_ctx: FixyExecutionContext): Promise<FixyExecutionResult> => ({
+      exitCode: 0,
+      signal: null,
+      timedOut: false,
+      summary: 'worker response here',
+      session: { sessionId: 'new-sess', params: {} },
+      patches: [],
+      warnings: [],
+      errorMessage: null,
+    });
+
+    registry.register(createStubAdapter('claude', 'Claude', customExecute));
+    thread.workerModel = 'claude';
+
+    await runner.run(makeCtx({ rest: 'explain this' }));
+
+    const fresh = await store.getThread(thread.id, thread.projectRoot);
+    const agentMsg = fresh.messages.find((m) => m.role === 'agent');
+
+    expect(agentMsg).toBeDefined();
+    expect(agentMsg?.agentId).toBe('fixy');
+    expect(agentMsg?.content).toBe('worker response here');
+  });
+});