@aiworker/web 1.22.0 → 1.23.0

package/server/lib/session-goal/runtime.test.js

@@ -18,7 +18,7 @@ const goal = {
 const session = {
   id: SESSION_ID,
   directory: DIRECTORY,
-  metadata: { openchamber: { goal } },
+  metadata: { aiworker: { goal } },
 };
 
 const jsonResponse = (body, status = 200) => new Response(JSON.stringify(body), {
@@ -46,6 +46,78 @@ const startIdleTick = async (fetchImpl) => {
   return { runtime, getSmallModelService };
 };
 
+const assistantMessage = (id, infoOverrides = {}) => ({
+  info: {
+    id,
+    sessionID: SESSION_ID,
+    role: 'assistant',
+    providerID: 'provider',
+    modelID: 'model',
+    time: { created: 2, completed: 2 },
+    tokens: { input: 1, output: 1, cache: { read: 0 } },
+    ...infoOverrides,
+  },
+  parts: [{ type: 'text', text: 'The agent made progress.' }],
+});
+
+const createRuntimeHarness = ({ messages, messageFactory, goalOverrides = {}, maxAutoTurns = 20 }) => {
+  const requests = [];
+  let messageFetchCount = 0;
+  const activeSession = {
+    ...session,
+    metadata: { aiworker: { goal: { ...goal, ...goalOverrides } } },
+  };
+  const service = {
+    generateSmallModelText: vi.fn(async () => ({
+      text: '{"verdict":"continue","note":"More work remains"}',
+      providerID: 'provider',
+      modelID: 'model',
+    })),
+  };
+  const fetchImpl = vi.fn(async (input, init = {}) => {
+    const pathname = requestPath(input);
+    requests.push({ pathname, method: init.method ?? 'GET', body: init.body });
+    if (pathname === `/session/${SESSION_ID}` && init.method === 'PATCH') {
+      activeSession.metadata = JSON.parse(init.body).metadata;
+      return jsonResponse(activeSession);
+    }
+    if (pathname === `/session/${SESSION_ID}`) return jsonResponse(activeSession);
+    if (pathname === '/session/status') return jsonResponse({});
+    if (pathname === `/session/${SESSION_ID}/children`) return jsonResponse([]);
+    if (pathname === `/session/${SESSION_ID}/message`) {
+      const nextMessages = messageFactory ? messageFactory(messageFetchCount) : messages;
+      messageFetchCount += 1;
+      return jsonResponse(nextMessages);
+    }
+    if (pathname === `/session/${SESSION_ID}/prompt_async`) return jsonResponse({ ok: true });
+    throw new Error(`Unexpected request: ${pathname}`);
+  });
+  vi.stubGlobal('fetch', fetchImpl);
+  const runtime = createSessionGoalRuntime({
+    buildOpenCodeUrl: (pathname) => `http://opencode.test${pathname}`,
+    getOpenCodeAuthHeaders: () => ({}),
+    getSmallModelService: async () => service,
+    isEnabled: () => true,
+    idleQuietMs: 10,
+    maxAutoTurns,
+  });
+  return { runtime, requests, service, activeSession };
+};
+
+const runIdleTick = async (runtime) => {
+  runtime.processPayload({
+    type: 'session.status',
+    properties: { sessionID: SESSION_ID, status: { type: 'idle' }, directory: DIRECTORY },
+  });
+  await vi.runOnlyPendingTimersAsync();
+};
+
+const lastPatchedGoal = (requests) => {
+  const patches = requests.filter((request) => request.pathname === `/session/${SESSION_ID}` && request.method === 'PATCH');
+  expect(patches.length).toBeGreaterThan(0);
+  return JSON.parse(patches.at(-1).body).metadata.aiworker.goal;
+};
+
 describe('session goal live activity gate', () => {
   beforeEach(() => {
     vi.useFakeTimers();
@@ -170,7 +242,7 @@ describe('session goal live activity gate', () => {
     expect(service.generateSmallModelText).toHaveBeenCalledOnce();
     const patch = requests.find((request) => request.pathname === `/session/${SESSION_ID}` && request.method === 'PATCH');
     expect(patch).toBeDefined();
-    const writtenGoal = JSON.parse(patch.body).metadata.openchamber.goal;
+    const writtenGoal = JSON.parse(patch.body).metadata.aiworker.goal;
     expect(writtenGoal).toMatchObject({
       status: 'complete',
       evaluationProviderID: 'provider',
@@ -178,4 +250,358 @@ describe('session goal live activity gate', () => {
     });
     runtime.stop();
   });
+
+  it('skips audit and sends continuation prompt when assistant message finishes with length stop', async () => {
+    const requests = [];
+    const fetchImpl = vi.fn(async (input, init = {}) => {
+      const pathname = requestPath(input);
+      requests.push({ pathname, method: init.method ?? 'GET', body: init.body });
+      if (pathname === `/session/${SESSION_ID}` && init.method === 'PATCH') return jsonResponse(session);
+      if (pathname === `/session/${SESSION_ID}`) return jsonResponse(session);
+      if (pathname === '/session/status') return jsonResponse({});
+      if (pathname === `/session/${SESSION_ID}/children`) return jsonResponse([]);
+      if (pathname === `/session/${SESSION_ID}/prompt_async`) return jsonResponse({ ok: true });
+      if (pathname === `/session/${SESSION_ID}/message`) {
+        return jsonResponse([{
+          info: {
+            id: 'msg_assistant_len',
+            sessionID: SESSION_ID,
+            role: 'assistant',
+            providerID: 'provider',
+            modelID: 'model',
+            finish: 'length',
+            time: { completed: 2 },
+            tokens: { input: 100, output: 4096, reasoning: 4096, cache: { read: 0 } },
+          },
+          parts: [{ type: 'reasoning', text: 'Drafting extensive implementation...' }],
+        }]);
+      }
+      throw new Error(`Unexpected request: ${pathname}`);
+    });
+    const service = {
+      generateSmallModelText: vi.fn(),
+    };
+    vi.stubGlobal('fetch', fetchImpl);
+    const runtime = createSessionGoalRuntime({
+      buildOpenCodeUrl: (pathname) => `http://opencode.test${pathname}`,
+      getOpenCodeAuthHeaders: () => ({}),
+      getSmallModelService: async () => service,
+      isEnabled: () => true,
+      idleQuietMs: 10,
+    });
+
+    runtime.processPayload({
+      type: 'session.status',
+      properties: { sessionID: SESSION_ID, status: { type: 'idle' }, directory: DIRECTORY },
+    });
+    await vi.runOnlyPendingTimersAsync();
+
+    // Audit must be skipped on length-truncated turn
+    expect(service.generateSmallModelText).not.toHaveBeenCalled();
+
+    // Goal accounting is persisted and turnsUsed incremented
+    const patch = requests.find((request) => request.pathname === `/session/${SESSION_ID}` && request.method === 'PATCH');
+    expect(patch).toBeDefined();
+    const writtenGoal = JSON.parse(patch.body).metadata.aiworker.goal;
+    expect(writtenGoal).toMatchObject({
+      status: 'active',
+      turnsUsed: 2,
+    });
+
+    // Continuation prompt is dispatched
+    const promptAsync = requests.find((request) => request.pathname === `/session/${SESSION_ID}/prompt_async` && request.method === 'POST');
+    expect(promptAsync).toBeDefined();
+    const promptBody = JSON.parse(promptAsync.body);
+    expect(promptBody.parts[0].text).toContain('Continue working toward the active session goal.');
+    runtime.stop();
+  });
+
+  it('skips audit and sends continuation prompt when assistant message carries MessageOutputLengthError', async () => {
+    const requests = [];
+    const fetchImpl = vi.fn(async (input, init = {}) => {
+      const pathname = requestPath(input);
+      requests.push({ pathname, method: init.method ?? 'GET', body: init.body });
+      if (pathname === `/session/${SESSION_ID}` && init.method === 'PATCH') return jsonResponse(session);
+      if (pathname === `/session/${SESSION_ID}`) return jsonResponse(session);
+      if (pathname === '/session/status') return jsonResponse({});
+      if (pathname === `/session/${SESSION_ID}/children`) return jsonResponse([]);
+      if (pathname === `/session/${SESSION_ID}/prompt_async`) return jsonResponse({ ok: true });
+      if (pathname === `/session/${SESSION_ID}/message`) {
+        return jsonResponse([{
+          info: {
+            id: 'msg_assistant_len_err',
+            sessionID: SESSION_ID,
+            role: 'assistant',
+            providerID: 'provider',
+            modelID: 'model',
+            error: { name: 'MessageOutputLengthError', message: 'Maximum token limit reached' },
+            time: { completed: 2 },
+            tokens: { input: 100, output: 4096, reasoning: 4096, cache: { read: 0 } },
+          },
+          parts: [{ type: 'reasoning', text: 'Drafting extensive implementation...' }],
+        }]);
+      }
+      throw new Error(`Unexpected request: ${pathname}`);
+    });
+    const service = {
+      generateSmallModelText: vi.fn(),
+    };
+    vi.stubGlobal('fetch', fetchImpl);
+    const runtime = createSessionGoalRuntime({
+      buildOpenCodeUrl: (pathname) => `http://opencode.test${pathname}`,
+      getOpenCodeAuthHeaders: () => ({}),
+      getSmallModelService: async () => service,
+      isEnabled: () => true,
+      idleQuietMs: 10,
+    });
+
+    runtime.processPayload({
+      type: 'session.status',
+      properties: { sessionID: SESSION_ID, status: { type: 'idle' }, directory: DIRECTORY },
+    });
+    await vi.runOnlyPendingTimersAsync();
+
+    // Audit must be skipped on MessageOutputLengthError
+    expect(service.generateSmallModelText).not.toHaveBeenCalled();
+
+    // Goal remains active and turnsUsed incremented
+    const patch = requests.find((request) => request.pathname === `/session/${SESSION_ID}` && request.method === 'PATCH');
+    expect(patch).toBeDefined();
+    const writtenGoal = JSON.parse(patch.body).metadata.aiworker.goal;
+    expect(writtenGoal).toMatchObject({
+      status: 'active',
+      turnsUsed: 2,
+    });
+
+    // Continuation prompt is dispatched
+    const promptAsync = requests.find((request) => request.pathname === `/session/${SESSION_ID}/prompt_async` && request.method === 'POST');
+    expect(promptAsync).toBeDefined();
+    runtime.stop();
+  });
+
+  it.each([
+    { name: 'APIError', error: { name: 'APIError', message: 'provider failed' } },
+    { name: 'StructuredOutputError', error: { name: 'StructuredOutputError', message: 'invalid output' } },
+    { name: 'unnamed errors', error: {} },
+  ])('blocks a length finish when the assistant also has a non-length $name', async ({ error }) => {
+    const { runtime, requests, service } = createRuntimeHarness({
+      messages: [assistantMessage('msg_assistant_error', { finish: 'length', error })],
+    });
+
+    await runIdleTick(runtime);
+
+    expect(service.generateSmallModelText).not.toHaveBeenCalled();
+    expect(requests.some((request) => request.pathname === `/session/${SESSION_ID}/prompt_async`)).toBe(false);
+    expect(lastPatchedGoal(requests)).toMatchObject({
+      status: 'blocked',
+      statusReason: error.name || 'assistant turn failed',
+    });
+    runtime.stop();
+  });
+
+  it('blocks after two consecutive length-truncated agent turns without persisting a counter, regardless of message IDs', async () => {
+    const firstLength = assistantMessage('z', { finish: 'length', time: { created: 10, completed: 11 } });
+    const summary = assistantMessage('summary', { summary: true, time: { created: 15, completed: 16 } });
+    const secondLength = assistantMessage('a', { finish: 'length', time: { created: 20, completed: 21 } });
+    const { runtime, requests, service } = createRuntimeHarness({
+      messageFactory: (fetchCount) => fetchCount < 2 ? [firstLength] : [firstLength, summary, secondLength],
+    });
+
+    await runIdleTick(runtime);
+    runtime.processPayload({
+      type: 'session.status',
+      properties: { sessionID: SESSION_ID, status: { type: 'idle' }, directory: DIRECTORY },
+    });
+    await vi.runOnlyPendingTimersAsync();
+
+    expect(service.generateSmallModelText).not.toHaveBeenCalled();
+    expect(requests.filter((request) => request.pathname === `/session/${SESSION_ID}/prompt_async`)).toHaveLength(1);
+    expect(lastPatchedGoal(requests)).toMatchObject({
+      status: 'blocked',
+      statusReason: 'repeated output truncation',
+    });
+    runtime.stop();
+  });
+
+  it('allows one explicit Resume after repeated truncation, then blocks another cutoff', async () => {
+    const first = assistantMessage('first', { finish: 'length', time: { created: 10, completed: 11 } });
+    const second = assistantMessage('second', { finish: 'length', time: { created: 20, completed: 21 } });
+    const messages = [first, second];
+    const { runtime, requests, activeSession } = createRuntimeHarness({ messages });
+    try {
+      await runIdleTick(runtime);
+      expect(lastPatchedGoal(requests).status).toBe('blocked');
+      expect(requests.filter((request) => request.pathname.endsWith('/prompt_async'))).toHaveLength(0);
+      Object.assign(activeSession.metadata.aiworker.goal, { status: 'active', statusReason: 'resumed', turnsUsed: 0 });
+      await runIdleTick(runtime);
+      expect(lastPatchedGoal(requests)).toMatchObject({ status: 'active', statusReason: '', turnsUsed: 1 });
+      expect(requests.filter((request) => request.pathname.endsWith('/prompt_async'))).toHaveLength(1);
+      messages.push(assistantMessage('third', { finish: 'length', time: { created: 30, completed: 31 } }));
+      await runIdleTick(runtime);
+      expect(lastPatchedGoal(requests)).toMatchObject({ status: 'blocked', statusReason: 'repeated output truncation' });
+      expect(requests.filter((request) => request.pathname.endsWith('/prompt_async'))).toHaveLength(1);
+    } finally {
+      runtime.stop();
+    }
+  });
+
+  it.each([
+    { tokenBudget: 1, error: undefined, expectedStatus: 'budgetLimited' },
+    { tokenBudget: null, error: { name: 'APIError' }, expectedStatus: 'blocked' },
+  ])('keeps $expectedStatus protection on explicit Resume', async ({ tokenBudget, error, expectedStatus }) => {
+    const { runtime, requests } = createRuntimeHarness({
+      goalOverrides: { statusReason: 'resumed', tokenBudget },
+      messages: [assistantMessage('resumed', { finish: 'length', error })],
+    });
+    try {
+      await runIdleTick(runtime);
+      expect(lastPatchedGoal(requests).status).toBe(expectedStatus);
+      expect(requests.filter((request) => request.pathname.endsWith('/prompt_async'))).toHaveLength(0);
+    } finally {
+      runtime.stop();
+    }
+  });
+
+  it('continues after a truncated agent turn followed by a length-finished summary', async () => {
+    const firstLength = assistantMessage('agent-length', { finish: 'length', time: { created: 10, completed: 11 } });
+    const summary = assistantMessage('summary', {
+      summary: true,
+      finish: 'length',
+      time: { created: 15, completed: 16 },
+    });
+    const { runtime, requests, service } = createRuntimeHarness({
+      messageFactory: (fetchCount) => fetchCount < 2 ? [firstLength] : [firstLength, summary],
+    });
+
+    await runIdleTick(runtime);
+    await runIdleTick(runtime);
+
+    expect(service.generateSmallModelText).not.toHaveBeenCalled();
+    expect(requests.filter((request) => request.pathname === `/session/${SESSION_ID}/prompt_async`)).toHaveLength(2);
+    expect(lastPatchedGoal(requests)).toMatchObject({ status: 'active' });
+    runtime.stop();
+  });
+
+  it('does not infer a repeated streak when a completed assistant timestamp is missing', async () => {
+    const firstLength = assistantMessage('z', { finish: 'length', time: { completed: 11 } });
+    const secondLength = assistantMessage('a', { finish: 'length', time: { created: 20, completed: 21 } });
+    const { runtime, requests, service } = createRuntimeHarness({
+      messageFactory: (fetchCount) => fetchCount < 2 ? [firstLength] : [firstLength, secondLength],
+    });
+
+    await runIdleTick(runtime);
+    await runIdleTick(runtime);
+
+    expect(service.generateSmallModelText).not.toHaveBeenCalled();
+    expect(requests.filter((request) => request.pathname === `/session/${SESSION_ID}/prompt_async`)).toHaveLength(2);
+    expect(lastPatchedGoal(requests)).toMatchObject({ status: 'active' });
+    runtime.stop();
+  });
+
+  it('ignores a missing timestamp on an older assistant when known post-goal turns establish a streak', async () => {
+    const olderLength = assistantMessage('legacy', { finish: 'length', time: { completed: 5 } });
+    const firstLength = assistantMessage('z', { finish: 'length', time: { created: 10, completed: 11 } });
+    const secondLength = assistantMessage('a', { finish: 'length', time: { created: 20, completed: 21 } });
+    const { runtime, requests, service } = createRuntimeHarness({
+      goalOverrides: { createdAt: 6 },
+      messageFactory: (fetchCount) => fetchCount < 2 ? [firstLength] : [olderLength, firstLength, secondLength],
+    });
+
+    await runIdleTick(runtime);
+    await runIdleTick(runtime);
+
+    expect(service.generateSmallModelText).not.toHaveBeenCalled();
+    expect(requests.filter((request) => request.pathname === `/session/${SESSION_ID}/prompt_async`)).toHaveLength(1);
+    expect(lastPatchedGoal(requests)).toMatchObject({
+      status: 'blocked',
+      statusReason: 'repeated output truncation',
+    });
+    runtime.stop();
+  });
+
+  it('does not count a previous truncated turn created at the goal boundary', async () => {
+    const firstLength = assistantMessage('before-boundary', { finish: 'length', time: { created: 10, completed: 11 } });
+    const secondLength = assistantMessage('after-boundary', { finish: 'length', time: { created: 20, completed: 21 } });
+    const { runtime, requests, service } = createRuntimeHarness({
+      goalOverrides: { createdAt: 10 },
+      messageFactory: (fetchCount) => fetchCount < 2 ? [firstLength] : [firstLength, secondLength],
+    });
+
+    await runIdleTick(runtime);
+    await runIdleTick(runtime);
+
+    expect(service.generateSmallModelText).not.toHaveBeenCalled();
+    expect(requests.filter((request) => request.pathname === `/session/${SESSION_ID}/prompt_async`)).toHaveLength(2);
+    expect(lastPatchedGoal(requests)).toMatchObject({ status: 'active' });
+    runtime.stop();
+  });
+
+  it('allows length recovery after an ordinary assistant turn breaks the streak', async () => {
+    const firstLength = assistantMessage('msg_length_before_normal', { finish: 'length' });
+    const normal = assistantMessage('msg_normal');
+    const secondLength = assistantMessage('msg_length_after_normal', { finish: 'length' });
+    const { runtime, requests, service } = createRuntimeHarness({
+      messageFactory: (fetchCount) => fetchCount < 2
+        ? [firstLength]
+        : [firstLength, normal, secondLength],
+    });
+
+    await runIdleTick(runtime);
+    await runIdleTick(runtime);
+
+    expect(service.generateSmallModelText).not.toHaveBeenCalled();
+    expect(requests.filter((request) => request.pathname === `/session/${SESSION_ID}/prompt_async`)).toHaveLength(2);
+    expect(lastPatchedGoal(requests)).toMatchObject({ status: 'active' });
+    runtime.stop();
+  });
+
+  it('keeps MessageAbortedError pause behavior instead of continuing', async () => {
+    const { runtime, requests, service } = createRuntimeHarness({
+      messages: [assistantMessage('msg_aborted', { error: { name: 'MessageAbortedError' } })],
+    });
+
+    await runIdleTick(runtime);
+
+    expect(service.generateSmallModelText).not.toHaveBeenCalled();
+    expect(requests.some((request) => request.pathname === `/session/${SESSION_ID}/prompt_async`)).toBe(false);
+    expect(lastPatchedGoal(requests)).toMatchObject({
+      status: 'paused',
+      statusReason: 'paused after abort',
+    });
+    runtime.stop();
+  });
+
+  it('checks the token budget before allowing length recovery', async () => {
+    const { runtime, requests, service } = createRuntimeHarness({
+      goalOverrides: { tokenBudget: 5 },
+      messages: [assistantMessage('msg_budget_length', {
+        finish: 'length',
+        tokens: { input: 3, output: 3, cache: { read: 0 } },
+      })],
+    });
+
+    await runIdleTick(runtime);
+
+    expect(service.generateSmallModelText).not.toHaveBeenCalled();
+    expect(requests.some((request) => request.pathname === `/session/${SESSION_ID}/prompt_async`)).toBe(false);
+    expect(lastPatchedGoal(requests)).toMatchObject({ status: 'budgetLimited' });
+    runtime.stop();
+  });
+
+  it('checks the auto-continuation cap before allowing length recovery', async () => {
+    const { runtime, requests, service } = createRuntimeHarness({
+      maxAutoTurns: 1,
+      messages: [assistantMessage('msg_cap_length', { finish: 'length' })],
+    });
+
+    await runIdleTick(runtime);
+
+    expect(service.generateSmallModelText).not.toHaveBeenCalled();
+    expect(requests.some((request) => request.pathname === `/session/${SESSION_ID}/prompt_async`)).toBe(false);
+    expect(lastPatchedGoal(requests)).toMatchObject({
+      status: 'blocked',
+      statusReason: 'auto-continuation limit reached',
+    });
+    runtime.stop();
+  });
 });

package/server/lib/session-knowledge/runtime.js

@@ -60,7 +60,7 @@ const buildMemoryBlock = ({ global, project }) => {
   return [
     'You have stored memory from earlier sessions. Only the titles are listed below.',
     'A title is an abbreviation, not the memory. Read the entry with the'
-      + ' openchamber_memory tool before you act on it: titles routinely leave out'
+      + ' aiworker_memory tool before you act on it: titles routinely leave out'
       + ' the conditions, exceptions and reasons that decide how the memory'
       + ' applies, and a title that looks self-explanatory is the most likely to'
       + ' be hiding them. Read every title that could bear on the task at hand;'
@@ -122,8 +122,8 @@ export const createSessionKnowledgeRuntime = (dependencies) => {
    */
   const readPins = (session) => {
     const metadata = isRecord(session?.metadata) ? session.metadata : {};
-    const openchamber = isRecord(metadata.openchamber) ? metadata.openchamber : {};
-    const pins = isRecord(openchamber[PINS_METADATA_KEY]) ? openchamber[PINS_METADATA_KEY] : {};
+    const aiworker = isRecord(metadata.aiworker) ? metadata.aiworker : {};
+    const pins = isRecord(aiworker[PINS_METADATA_KEY]) ? aiworker[PINS_METADATA_KEY] : {};
     const strings = (value) => Array.isArray(value)
       ? [...new Set(value.filter((entry) => typeof entry === 'string' && entry.trim()).map((entry) => entry.trim()))]
       : [];
@@ -229,8 +229,8 @@ export const createSessionKnowledgeRuntime = (dependencies) => {
 
   const readDeliveredSignature = (session) => {
     const metadata = isRecord(session?.metadata) ? session.metadata : {};
-    const openchamber = isRecord(metadata.openchamber) ? metadata.openchamber : {};
-    const delivered = openchamber[KNOWLEDGE_METADATA_KEY];
+    const aiworker = isRecord(metadata.aiworker) ? metadata.aiworker : {};
+    const delivered = aiworker[KNOWLEDGE_METADATA_KEY];
     return typeof delivered === 'string' ? delivered : '';
   };
 
@@ -267,7 +267,7 @@ export const createSessionKnowledgeRuntime = (dependencies) => {
   const setPin = async (sessionId, directory, kind, id, pinned) => {
     const fresh = await readSession(sessionId, directory);
     const metadata = isRecord(fresh?.metadata) ? fresh.metadata : {};
-    const openchamber = isRecord(metadata.openchamber) ? metadata.openchamber : {};
+    const aiworker = isRecord(metadata.aiworker) ? metadata.aiworker : {};
     const pins = readPins(fresh);
     const key = kind === 'note' ? 'notes' : 'plans';
     const next = new Set(pins[key]);
@@ -279,8 +279,8 @@ export const createSessionKnowledgeRuntime = (dependencies) => {
       body: {
         metadata: {
           ...metadata,
-          openchamber: {
-            ...openchamber,
+          aiworker: {
+            ...aiworker,
             [PINS_METADATA_KEY]: { ...pins, [key]: [...next] },
             [KNOWLEDGE_METADATA_KEY]: '',
           },
@@ -296,20 +296,20 @@ export const createSessionKnowledgeRuntime = (dependencies) => {
    * agent had context it never received.
    *
    * Merged onto a fresh read, because the session's metadata holds other
-   * OpenChamber state — pinned messages among it — and a blind write would
+   * AiWorker state — pinned messages among it — and a blind write would
    * drop whatever changed in between.
    */
   const recordDelivered = async (sessionId, directory, signature) => {
     const fresh = await readSession(sessionId, directory);
     const metadata = isRecord(fresh?.metadata) ? fresh.metadata : {};
-    const openchamber = isRecord(metadata.openchamber) ? metadata.openchamber : {};
+    const aiworker = isRecord(metadata.aiworker) ? metadata.aiworker : {};
     await openCodeFetch(`/session/${encodeURIComponent(sessionId)}`, {
       directory,
       method: 'PATCH',
       body: {
         metadata: {
           ...metadata,
-          openchamber: { ...openchamber, [KNOWLEDGE_METADATA_KEY]: signature },
+          aiworker: { ...aiworker, [KNOWLEDGE_METADATA_KEY]: signature },
         },
       },
     });

package/server/lib/session-knowledge/runtime.test.js

@@ -193,10 +193,10 @@ describe('reading what a session was told', () => {
     const runtime = createRuntime();
 
     expect(runtime.readPins({
-      metadata: { openchamber: { project_context_pins: { notes: ['n1'], plans: [] } } },
+      metadata: { aiworker: { project_context_pins: { notes: ['n1'], plans: [] } } },
     })).toEqual({ notes: ['n1'], plans: [] });
     expect(runtime.readPins({
-      metadata: { openchamber: { project_context_pins: { notes: [], plans: ['p1'] } } },
+      metadata: { aiworker: { project_context_pins: { notes: [], plans: ['p1'] } } },
     })).toEqual({ notes: [], plans: ['p1'] });
     expect(runtime.readPins({})).toEqual({ notes: [], plans: [] });
   });
@@ -208,7 +208,7 @@ describe('reading what a session was told', () => {
         requests.push({ path, options });
         if (options.method === 'PATCH') return {};
         return {
-          metadata: { openchamber: { project_context_pins: { notes: [], plans: [] }, knowledge_context_delivered: 'old' } },
+          metadata: { aiworker: { project_context_pins: { notes: [], plans: [] }, knowledge_context_delivered: 'old' } },
         };
       },
     });
@@ -216,7 +216,7 @@ describe('reading what a session was told', () => {
     await runtime.setPin('ses_a', DIRECTORY, 'note', 'n1', true);
 
     expect(requests.map((request) => request.path)).toEqual(['/session/ses_a', '/session/ses_a']);
-    expect(requests[1].options.body.metadata.openchamber).toEqual({
+    expect(requests[1].options.body.metadata.aiworker).toEqual({
       project_context_pins: { notes: ['n1'], plans: [] },
       knowledge_context_delivered: '',
     });
@@ -226,7 +226,7 @@ describe('reading what a session was told', () => {
     const runtime = createRuntime();
 
     expect(runtime.readDeliveredSignature({
-      metadata: { openchamber: { knowledge_context_delivered: 'sig' } },
+      metadata: { aiworker: { knowledge_context_delivered: 'sig' } },
     })).toBe('sig');
   });
 

package/server/lib/skills-catalog/DOCUMENTATION.md

@@ -58,7 +58,7 @@ The following functions are internal helpers used by exported functions:
 - `safeRm(dir)`: Safely remove directory recursively (ignores errors).
 - `ensureDir(dirPath)`: Ensure directory exists with recursive creation.
 - `copyDirectoryNoSymlinks(srcDir, dstDir)`: Copy directory contents without symlinks, with path traversal protection.
-- `normalizeUserSkillDir(userSkillDir)`: Normalize user skill directory path (handles legacy `~/.config/opencode/skill` → `~/.config/opencode/skills` migration).
+- `normalizeUserSkillDir(userSkillDir)`: Normalize the user skill directory path (handles the legacy `skill` directory in the XDG config location, or `~/.config/opencode/skill` when XDG is unset, by selecting the plural `skills` directory when appropriate).
 
 ### Git Clone Helpers (`install.js`, `scan.js`)
 - `cloneRepo({ cloneUrl, identity, tempDir })`: Clone git repository with preferred partial clone (`--filter=blob:none`) and fallback. Uses non-interactive mode.

package/server/lib/skills-catalog/cache.test.js

@@ -8,11 +8,11 @@ let tempDataDir;
 
 beforeEach(() => {
   tempDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'skills-cache-test-'));
-  process.env.OPENCHAMBER_DATA_DIR = tempDataDir;
+  process.env.AIWORKER_DATA_DIR = tempDataDir;
 });
 
 afterEach(() => {
-  delete process.env.OPENCHAMBER_DATA_DIR;
+  delete process.env.AIWORKER_DATA_DIR;
   clearCache();
   vi.restoreAllMocks();
   fs.rmSync(tempDataDir, { recursive: true, force: true });

package/server/lib/skills-catalog/disk-cache.js

@@ -2,9 +2,9 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 
-const resolveDataDir = () => (process.env.OPENCHAMBER_DATA_DIR
-  ? path.resolve(process.env.OPENCHAMBER_DATA_DIR)
-  : path.join(os.homedir(), '.config', 'openchamber'));
+const resolveDataDir = () => (process.env.AIWORKER_DATA_DIR
+  ? path.resolve(process.env.AIWORKER_DATA_DIR)
+  : path.join(os.homedir(), '.config', 'aiworker'));
 
 const readJsonFile = (filePath) => {
   try {
@@ -17,7 +17,7 @@ const readJsonFile = (filePath) => {
 };
 
 /**
- * Read a persisted cache object from the OpenChamber data directory.
+ * Read a persisted cache object from the AiWorker data directory.
  * Returns null when the file is missing, unreadable, or malformed.
  */
 export const readDiskCache = (fileName) => {
@@ -29,7 +29,7 @@ export const readDiskCache = (fileName) => {
 };
 
 /**
- * Persist a cache object to the OpenChamber data directory with an atomic
+ * Persist a cache object to the AiWorker data directory with an atomic
  * temp-file rename. Failures are ignored: the in-memory cache stays
  * authoritative and the next successful write retries persistence.
  */

package/server/lib/skills-catalog/github-meta.test.js

@@ -10,11 +10,11 @@ let tempDataDir;
 
 beforeEach(() => {
   tempDataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'github-meta-test-'));
-  process.env.OPENCHAMBER_DATA_DIR = tempDataDir;
+  process.env.AIWORKER_DATA_DIR = tempDataDir;
 });
 
 afterEach(() => {
-  delete process.env.OPENCHAMBER_DATA_DIR;
+  delete process.env.AIWORKER_DATA_DIR;
   globalThis.fetch = originalFetch;
   clearGitHubMetaCache();
   vi.restoreAllMocks();

package/server/lib/skills-catalog/install.js

@@ -4,13 +4,14 @@ import path from 'path';
 
 import { assertGitAvailable, looksLikeAuthError, runGit } from './git.js';
 import { parseSkillRepoSource } from './source.js';
+import { OPENCODE_CONFIG_DIR } from '../opencode/shared.js';
 
 const SKILL_NAME_PATTERN = /^[a-z0-9][a-z0-9-]*[a-z0-9]$|^[a-z0-9]$/;
 
 function normalizeUserSkillDir(userSkillDir) {
   if (!userSkillDir) return null;
-  const legacySkillDir = path.join(os.homedir(), '.config', 'opencode', 'skill');
-  const pluralSkillDir = path.join(os.homedir(), '.config', 'opencode', 'skills');
+  const legacySkillDir = path.join(OPENCODE_CONFIG_DIR, 'skill');
+  const pluralSkillDir = path.join(OPENCODE_CONFIG_DIR, 'skills');
   if (userSkillDir === legacySkillDir) {
     if (fs.existsSync(legacySkillDir) && !fs.existsSync(pluralSkillDir)) return legacySkillDir;
     return pluralSkillDir;