@aiworker/web 1.22.0 → 1.22.2

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;

package/server/lib/small-model/DOCUMENTATION.md

@@ -91,6 +91,10 @@ other runtime API.
   a blocker instead of a raw 500 message.
 - `call.js` — wire formats and per-provider auth, replicating OpenCode's
   plugin auth loaders:
+  - OpenCode-hosted providers receive `x-opencode-session`. Session-backed
+    features reuse the real OpenCode session id, walkthrough retries reuse the
+    walkthrough cache key, and standalone one-shot actions receive a fresh
+    opaque id for that generation.
   - **GitHub Copilot**: fetches the requested model's authenticated `/models`
     metadata from `https://api.githubcopilot.com` (or
     `copilot-api.<enterprise>`) and honors its advertised endpoint, preferring

package/server/lib/small-model/call.js

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
+import { randomUUID } from 'node:crypto';
 import { readAuthFile, writeAuthFile } from '../opencode/auth.js';
 import { readConfig, readConfigLayers, isPlainObject } from '../opencode/shared.js';
 import { getCatalogProvider } from './catalog.js';
@@ -17,7 +18,7 @@ const COPILOT_MODELS_TIMEOUT_MS = 5_000;
 // Qwen, …) spend part of this budget on reasoning before the actual answer.
 const DEFAULT_MAX_OUTPUT_TOKENS = 4_000;
 
-const USER_AGENT = 'opencode/1.0 openchamber';
+const USER_AGENT = 'opencode/1.0 aiworker';
 
 const mergeHeadersCaseInsensitive = (base, overrides) => {
   const merged = { ...base };
@@ -645,7 +646,7 @@ export async function resolveProviderLogin({ auth, workingDirectory, providerID
     || null;
 }
 
-export async function callSmallModel({ auth, catalog, workingDirectory, providerID, modelID, prompt, system, maxOutputTokens, responseSchema, timeoutMs, signal }) {
+export async function callSmallModel({ auth, catalog, workingDirectory, sessionID, providerID, modelID, prompt, system, maxOutputTokens, responseSchema, timeoutMs, signal }) {
   const tokens = Number(maxOutputTokens) > 0 ? Number(maxOutputTokens) : DEFAULT_MAX_OUTPUT_TOKENS;
   const providerConfig = readProviderConfig(workingDirectory, providerID);
   const runtimeProvider = await getRuntimeProvider(providerID);
@@ -795,7 +796,12 @@ export async function callSmallModel({ auth, catalog, workingDirectory, provider
     baseURL,
     // Configured headers last: a gateway that authenticates on its own header
     // must be able to override the bearer default rather than sit beside it.
-    headers: mergeHeadersCaseInsensitive({ Authorization: `Bearer ${apiKey}` }, providerConfig?.headers),
+    headers: mergeHeadersCaseInsensitive(
+      mergeHeadersCaseInsensitive({ Authorization: `Bearer ${apiKey}` }, providerConfig?.headers),
+      providerID.startsWith('opencode')
+        ? { 'x-opencode-session': typeof sessionID === 'string' && sessionID.trim() ? sessionID.trim() : randomUUID() }
+        : null,
+    ),
     modelID,
     prompt,
     system,

package/server/lib/small-model/call.test.js

@@ -69,8 +69,8 @@ describe('callSmallModel — custom provider config', () => {
   afterEach(() => {
     globalThis.fetch = originalFetch;
     vi.restoreAllMocks();
-    delete process.env.OPENCHAMBER_TEST_PROVIDER_KEY;
-    delete process.env.OPENCHAMBER_TEST_GATEWAY_KEY;
+    delete process.env.AIWORKER_TEST_PROVIDER_KEY;
+    delete process.env.AIWORKER_TEST_GATEWAY_KEY;
   });
 
   describe('config-supplied credentials (no auth.json entry)', () => {
@@ -104,11 +104,11 @@ describe('callSmallModel — custom provider config', () => {
     });
 
     it('resolves an OpenCode environment variable before sending the API key', async () => {
-      process.env.OPENCHAMBER_TEST_PROVIDER_KEY = 'sk-env-key';
+      process.env.AIWORKER_TEST_PROVIDER_KEY = 'sk-env-key';
       readConfig.mockReturnValue({
         provider: {
           custom: {
-            options: { apiKey: '{env:OPENCHAMBER_TEST_PROVIDER_KEY}', baseURL: 'https://proxy.example.test/v1' },
+            options: { apiKey: '{env:AIWORKER_TEST_PROVIDER_KEY}', baseURL: 'https://proxy.example.test/v1' },
           },
         },
       });
@@ -127,7 +127,7 @@ describe('callSmallModel — custom provider config', () => {
     });
 
     it('sends configured provider headers alongside the bearer token', async () => {
-      process.env.OPENCHAMBER_TEST_GATEWAY_KEY = 'sub-key';
+      process.env.AIWORKER_TEST_GATEWAY_KEY = 'sub-key';
       readConfig.mockReturnValue({
         provider: {
           custom: {
@@ -135,7 +135,7 @@ describe('callSmallModel — custom provider config', () => {
               apiKey: 'sk-config',
               baseURL: 'https://proxy.example.test/v1',
               headers: {
-                'Ocp-Apim-Subscription-Key': '{env:OPENCHAMBER_TEST_GATEWAY_KEY}',
+                'Ocp-Apim-Subscription-Key': '{env:AIWORKER_TEST_GATEWAY_KEY}',
                 'x-tenant': 'team',
               },
             },
@@ -483,6 +483,29 @@ describe('callSmallModel — custom provider config', () => {
   });
 
   describe('catalog-based base URL (no config override)', () => {
+    it('identifies OpenCode Go requests with the owning conversation', async () => {
+      readConfig.mockReturnValue({});
+      fetchMock.mockResolvedValue(ok('ok'));
+
+      await callSmallModel({
+        auth: { 'opencode-go': { type: 'api', key: 'go-key' } },
+        catalog: {
+          'opencode-go': {
+            id: 'opencode-go',
+            api: 'https://opencode.ai/zen/go/v1',
+            models: { utility: { id: 'utility' } },
+          },
+        },
+        workingDirectory: '/proj',
+        sessionID: 'ses_conversation',
+        providerID: 'opencode-go',
+        modelID: 'utility',
+        prompt: 'hi',
+      });
+
+      expect(lastCall(fetchMock).init.headers['x-opencode-session']).toBe('ses_conversation');
+    });
+
     it('uses the catalog api field when no config baseURL is set', async () => {
       readConfig.mockReturnValue({});
       fetchMock.mockResolvedValue(ok('ok'));

package/server/lib/small-model/index.js

@@ -16,18 +16,18 @@ import { getRuntimeProviderSnapshot } from './runtime-providers.js';
 // conditional on an endpoint existing.
 const CLAUDE_CODE_PROVIDER = 'claude-code';
 
-const OPENCHAMBER_SETTINGS_FILE = path.join(
-  process.env.OPENCHAMBER_DATA_DIR
-    ? path.resolve(process.env.OPENCHAMBER_DATA_DIR)
-    : path.join(os.homedir(), '.config', 'openchamber'),
+const AIWORKER_SETTINGS_FILE = path.join(
+  process.env.AIWORKER_DATA_DIR
+    ? path.resolve(process.env.AIWORKER_DATA_DIR)
+    : path.join(os.homedir(), '.config', 'aiworker'),
   'settings.json',
 );
 
-// OpenChamber's own settings: when the user unchecks "use default small model"
+// AiWorker's own settings: when the user unchecks "use default small model"
 // their explicit override outranks every other resolution step.
 const readSmallModelSettingsOverride = () => {
   try {
-    const raw = fs.readFileSync(OPENCHAMBER_SETTINGS_FILE, 'utf8');
+    const raw = fs.readFileSync(AIWORKER_SETTINGS_FILE, 'utf8');
     const settings = JSON.parse(raw);
     if (!settings || typeof settings !== 'object') return null;
     if (settings.smallModelUseDefault !== false) return null;
@@ -102,7 +102,7 @@ const readConfiguredSmallModel = (workingDirectory) => {
  * Generates text with the user's small model, resolved and authenticated
  * entirely server-side from the OpenCode config and auth store.
  */
-export async function generateSmallModelText({ prompt, system, maxOutputTokens, model, directory, preferredProviderID, preferredModelID, restrictToPreferredProvider = false, responseSchema, timeoutMs, signal, onOverflow = 'truncate' }) {
+export async function generateSmallModelText({ prompt, system, maxOutputTokens, model, directory, sessionID, preferredProviderID, preferredModelID, restrictToPreferredProvider = false, responseSchema, timeoutMs, signal, onOverflow = 'truncate' }) {
   if (typeof prompt !== 'string' || !prompt.trim()) {
     throw Object.assign(new Error('prompt is required'), { statusCode: 400 });
   }
@@ -169,6 +169,7 @@ export async function generateSmallModelText({ prompt, system, maxOutputTokens,
     auth,
     catalog,
     workingDirectory: directory,
+    sessionID,
     providerID: resolved.providerID,
     modelID: resolved.modelID,
     prompt: clamped.prompt,

package/server/lib/small-model/index.test.js

@@ -7,7 +7,7 @@ import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vites
 // this the suite would resolve whatever small model the developer running it
 // happens to have configured.
 const TEMP_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), 'small-model-settings-'));
-process.env.OPENCHAMBER_DATA_DIR = TEMP_DATA_DIR;
+process.env.AIWORKER_DATA_DIR = TEMP_DATA_DIR;
 
 vi.mock('../opencode/auth.js', () => ({ readAuthFile: vi.fn() }));
 vi.mock('../opencode/shared.js', () => ({

package/server/lib/small-model/resolve.js

@@ -76,7 +76,7 @@ const pickWithinProvider = (providerID, auth, catalog, family) => {
 };
 
 export function resolveSmallModel({ auth, catalog, settingsSmallModel, configSmallModel, preferredProviderID, preferredModelID }) {
-  // OpenChamber's own setting (Settings → Sessions → Small Model override)
+  // AiWorker's own setting (Settings → Sessions → Small Model override)
   // outranks everything, including the OpenCode config.
   const fromSettings = parseModelRef(settingsSmallModel);
   if (fromSettings) {

package/server/lib/small-model/resolve.test.js

@@ -57,7 +57,7 @@ describe('isUsableAuthEntry', () => {
 });
 
 describe('resolveSmallModel', () => {
-  it('gives the OpenChamber settings override top priority', () => {
+  it('gives the AiWorker settings override top priority', () => {
     const result = resolveSmallModel({
       auth: { anthropic: { type: 'api', key: 'sk-x' } },
       catalog,

package/server/lib/small-model/routes.js

@@ -21,13 +21,14 @@ export function registerSmallModelRoutes(app, { getSmallModelService }) {
   app.post('/api/small-model/generate', async (req, res) => {
     try {
       const { generateSmallModelText } = await getSmallModelService();
-      const { prompt, system, maxOutputTokens, model, directory, preferredProviderID, preferredModelID, restrictToPreferredProvider } = req.body || {};
+      const { prompt, system, maxOutputTokens, model, directory, sessionID, preferredProviderID, preferredModelID, restrictToPreferredProvider } = req.body || {};
       const result = await generateSmallModelText({
         prompt,
         system,
         maxOutputTokens,
         model,
         directory,
+        sessionID,
         preferredProviderID,
         preferredModelID,
         restrictToPreferredProvider: restrictToPreferredProvider === true,

package/server/lib/system-prompt/runtime.js

@@ -1,5 +1,5 @@
-import { parse as parseJsonc } from 'jsonc-parser';
 import { pathToFileURL } from 'node:url';
+import { appendManagedPlugin } from '../opencode/managed-plugin-config.js';
 
 const PROVIDER_PROMPT_BOUNDARY = 'You are powered by the model named';
 const MINIMAL_IDENTITY = 'You are OpenCode, a coding agent.';
@@ -9,7 +9,7 @@ const PROVIDER_PROMPT_BOUNDARY = ${JSON.stringify(PROVIDER_PROMPT_BOUNDARY)}
 const MINIMAL_IDENTITY = ${JSON.stringify(MINIMAL_IDENTITY)}
 const optimizedSessions = new Map()
 
-export const OpenChamberSystemPromptPlugin = async () => ({
+export const AiWorkerSystemPromptPlugin = async () => ({
   "chat.message": async (input, output) => {
     if (!input.sessionID) return
     const agent = output?.message?.agent ?? input.agent
@@ -33,25 +33,6 @@ export const OpenChamberSystemPromptPlugin = async () => ({
 })
 `;
 
-const mergePluginConfig = (rawConfig, pluginUrl) => {
-  const errors = [];
-  const parsed = typeof rawConfig === 'string' && rawConfig.trim()
-    ? parseJsonc(rawConfig, errors, { allowTrailingComma: true })
-    : {};
-  if (errors.length > 0 || !parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-    throw new Error('OPENCODE_CONFIG_CONTENT must contain a valid JSON object before OpenChamber can inject its system prompt optimizer');
-  }
-  if (parsed.plugin !== undefined && !Array.isArray(parsed.plugin)) {
-    throw new Error('OPENCODE_CONFIG_CONTENT plugin must be an array before OpenChamber can inject its system prompt optimizer');
-  }
-  const configured = Array.isArray(parsed.plugin) ? parsed.plugin : [];
-  parsed.plugin = [
-    ...configured.filter((value) => value !== pluginUrl && (!Array.isArray(value) || value[0] !== pluginUrl)),
-    pluginUrl,
-  ];
-  return JSON.stringify(parsed);
-};
-
 export const createSystemPromptRuntime = ({ fsPromises, path, dataDir }) => {
   const pluginDirectory = path.join(dataDir, 'system-prompt');
   const pluginPath = path.join(pluginDirectory, 'openchamber-system-prompt-plugin.js');
@@ -60,7 +41,7 @@ export const createSystemPromptRuntime = ({ fsPromises, path, dataDir }) => {
     await fsPromises.mkdir(pluginDirectory, { recursive: true });
     await fsPromises.writeFile(pluginPath, createPluginSource(), { mode: 0o600 });
     return {
-      OPENCODE_CONFIG_CONTENT: mergePluginConfig(rawConfig, pathToFileURL(pluginPath).href),
+      OPENCODE_CONFIG_CONTENT: appendManagedPlugin(rawConfig, pathToFileURL(pluginPath).href, 'system prompt optimizer'),
     };
   };
 

package/server/lib/system-prompt/runtime.test.js

@@ -25,7 +25,7 @@ describe('managed system prompt runtime', () => {
     expect(config.model).toBe('test/model');
     expect(config.plugin).toEqual(['file:///existing.js', pathToFileURL(pluginPath).href]);
     const pluginModule = await import(`${pathToFileURL(pluginPath).href}?test=${Date.now()}`);
-    const hooks = await pluginModule.OpenChamberSystemPromptPlugin();
+    const hooks = await pluginModule.AiWorkerSystemPromptPlugin();
     const output = {
       system: ['Behavioral prompt\nYou are powered by the model named GPT.\n<env>kept</env>'],
     };
@@ -46,7 +46,7 @@ describe('managed system prompt runtime', () => {
     await runtime.prepareManagedOpenCodeEnv('{}');
     const pluginPath = path.join(dataDir, 'system-prompt', 'openchamber-system-prompt-plugin.js');
     const pluginModule = await import(`${pathToFileURL(pluginPath).href}?test=${Date.now()}`);
-    const hooks = await pluginModule.OpenChamberSystemPromptPlugin();
+    const hooks = await pluginModule.AiWorkerSystemPromptPlugin();
     const output = { system: ['Unrecognized prompt'] };
     await hooks['chat.message']({ sessionID: 'session-1', agent: 'plan' });
     await hooks['experimental.chat.system.transform']({ sessionID: 'session-1' }, output);
@@ -60,7 +60,7 @@ describe('managed system prompt runtime', () => {
     await runtime.prepareManagedOpenCodeEnv('{}');
     const pluginPath = path.join(dataDir, 'system-prompt', 'openchamber-system-prompt-plugin.js');
     const pluginModule = await import(`${pathToFileURL(pluginPath).href}?test=${Date.now()}`);
-    const hooks = await pluginModule.OpenChamberSystemPromptPlugin();
+    const hooks = await pluginModule.AiWorkerSystemPromptPlugin();
     const output = {
       system: ['Custom agent prompt\nYou are powered by the model named GPT.\n<env>kept</env>'],
     };

package/server/lib/terminal/DOCUMENTATION.md

@@ -2,7 +2,7 @@
 
 ## Ownership
 
-`runtime.js` owns terminal identity, PTY processes, status, ordered output, bounded scrollback, WebSocket attachments, and lifecycle routes. `shells.js` discovers executable shell families and resolves the persisted shell ID without accepting command strings or arguments. Clients own tab arrangement and choose stable terminal IDs. Electron uses this same runtime in-process; VS Code returns an explicit unsupported error.
+`runtime.js` owns terminal identity, PTY processes, launch mode, session purpose, ordered output, bounded scrollback, WebSocket attachments, and lifecycle routes. `shells.js` discovers executable shell families, resolves the persisted shell ID, and builds the per-shell argv for interactive versus command launches. Clients own tab arrangement. Interactive terminals use stable IDs; project actions keep a stable UI tab and allocate a fresh terminal ID for each command execution. Electron uses this same runtime in-process; VS Code returns an explicit unsupported error.
 
 ## Protocol
 
@@ -19,21 +19,25 @@
 
 HTTP remains the authenticated command plane for create, resize, appearance updates, restart, close, and force-kill. There is no SSE output or HTTP input compatibility path.
 
-`GET /api/terminal/sessions` enumerates live sessions (optionally filtered by resolved `cwd`) so clients can adopt terminals their local tab projection does not know about — another device, a new browser tab, or cleared storage. `POST /api/terminal/touch` refreshes `lastActivity` for the listed session ids; open clients call it periodically so background tabs, which hold no WebSocket attachment, are not idle-reaped while a client still shows them.
+`GET /api/terminal/sessions` enumerates live sessions (optionally filtered by resolved `cwd`) so clients can adopt terminals their local tab projection does not know about — another device, a new browser tab, or cleared storage. Listings include the effective launch mode and the normalized purpose, but never the command text. `POST /api/terminal/touch` refreshes `lastActivity` for the listed session ids; open clients call it periodically so background tabs, which hold no WebSocket attachment, are not idle-reaped while a client still shows them.
 
 ## PTY Lifecycle
 
 - IDs are client-provided or generated with `randomUUID()`.
-- Concurrent creates for one ID are single-flight only when working directory and shell preference match. Existing IDs cannot be reused for another working directory.
+- Create defaults to interactive mode. Command mode requires a non-empty trimmed command no longer than the terminal input limit and launches the shell so the PTY exits when that command exits. Each session also carries a normalized purpose. Omitted purpose means `{ type: 'terminal' }`. Project actions use `{ type: 'project-action', actionId, executionId }`, and the server validates both IDs as non-empty bounded strings. Create responses and attach snapshots echo the effective mode and purpose.
+- Concurrent creates for one ID are single-flight only when working directory, shell preference, login mode, launch mode, and session purpose match. Command-mode creates must also match the command text, unless the purpose is a project action that is already running for the same resolved `(cwd, actionId)` pair. In that case the runtime returns the existing session and its existing execution identity, even when another client requested a different session ID. Existing IDs cannot be reused for another working directory or another purpose.
 - Dimensions are bounded to 1-1000 columns and 1-500 rows; input is capped at 64 KiB.
 - A client may create before its renderer has mounted. It derives an initial size from the container and font metrics (falling back to 80x24 when unavailable), then sends a resize once Ghostty reports its final dimensions. This allows shell startup and renderer initialization to overlap.
 - PTY children explicitly clear `NODE_CHANNEL_FD`; daemon IPC descriptors are host-private and invalid after PTY descriptor cleanup.
 - PTY children also strip AppImage `ARGV0` (and other host-private shell vars such as `ELECTRON_RUN_AS_NODE`, `BASH_ENV`, `ENV`, `BASH_XTRACEFD`). An exported `ARGV0` makes zsh rewrite argv[0] for every external command, which breaks Python venv detection and other argv[0]/$0 consumers while leaving `/proc/self/exe` correct. On Linux, PTY spawn is wrapped with `env -u ARGV0` because `bun-pty` merges the native OS environ and would otherwise reintroduce `ARGV0` after a JS-only delete.
-- `GET /api/terminal/shells` reports shell IDs available on the active server using the same augmented PATH provided to spawned PTYs, plus whether each executable has a supported login-mode argument. `auto` preserves environment/platform fallback order; an explicit unavailable shell fails creation instead of silently running a different shell. Login mode is opt-in and uses only built-in arguments for known shells. Preference changes affect new sessions and explicit restarts, not running PTYs.
-- PTY data and exit callbacks enter one FIFO queue. Stale callbacks from replaced processes are ignored.
+- `GET /api/terminal/shells` reports shell IDs available on the active server using the same augmented PATH provided to spawned PTYs, plus whether each executable has a supported login-mode argument. `auto` preserves environment/platform fallback order; an explicit unavailable shell fails creation instead of silently running a different shell. Login mode is opt-in and uses only built-in arguments for known shells. Interactive shells still launch as before. Command-mode launches reuse the same environment and login support, but switch argv by shell family: POSIX and Fish use interactive `-c`, Nushell uses `-c`, PowerShell uses `-Command`, and cmd uses `/d /s /c`. Preference changes affect new sessions and explicit restarts, not running PTYs.
+- PTY data and exit callbacks enter one FIFO queue. The runtime wires those listeners in the same synchronous turn that receives the PTY object. `node-pty` and `bun-pty` both expose the PTY before dispatching registered callbacks. If a backend emitted exit before listener registration, this layer could not recover it, so the wiring stays adjacent to PTY creation.
 - Scrollback is retained on the server and capped at 512 KiB with UTF-8-safe trimming. Device-status, device-attribute, cursor-position reply, and color-query exchanges are removed from replay history with incomplete control sequences carried across PTY chunks; live output remains byte-for-byte unchanged.
-- Exited sessions remain attachable until explicit close or idle cleanup.
-- Restarts are serialized per terminal. Each restart spawns and wires the replacement before terminating the old process, retaining the terminal ID.
+- Exited sessions remain attachable until explicit close, idle cleanup, or a successful replacement of the same project action. Creating a replacement retires only exited records for the same resolved directory and action, after the new PTY starts. Failed creation preserves the old record and output. These replaced records do not exhaust the terminal capacity limit.
+- Deduplicated create responses may describe another client's execution. Cancellation cleanup closes only the terminal ID allocated for the cancelled request; it never closes an adopted peer execution.
+- Create and restart validate the working directory with a real `stat` and answer HTTP 400 `Invalid working directory` when it is not a directory. When the path does not exist at all (`ENOENT`/`ENOTDIR`, a worktree deleted outside AiWorker) the body also carries `code: "TERMINAL_CWD_MISSING"`. That is the one rejection the client can recover from: the session, not the terminal, is stranded, and the shared UI moves it to its project directory and starts a terminal there. Every other rejection stays generic; the runtime never substitutes a parent directory on its own.
+- Restarts are serialized per terminal. Each restart spawns and wires the replacement before terminating the old process, retaining the terminal ID. Command-mode sessions reject restart with HTTP 400 instead of silently turning into interactive shells with stale action metadata.
+- A delete that arrives while create is still pending leaves a cancellation tombstone. When the PTY arrives, the runtime terminates it immediately, never inserts the session into the live map, and returns a create error while the delete still succeeds.
 - Close uses SIGTERM with bounded SIGKILL escalation. Force-kill, idle cleanup, and runtime shutdown terminate process groups immediately where supported. Removal explicitly sends a fatal scoped closure and evicts client projections even when a PTY backend fails to emit `onExit`; attached terminals are not considered idle.
 
 ## Security And Relay