@aiworker/web 1.22.0 → 1.23.0

package/server/lib/terminal/shells.js

@@ -1,5 +1,6 @@
 const TERMINAL_SHELL_IDS = ['bash', 'zsh', 'sh', 'fish', 'pwsh', 'powershell', 'cmd', 'dash', 'ksh', 'nu'];
 const TERMINAL_SHELL_ID_SET = new Set(TERMINAL_SHELL_IDS);
+const isString = (value) => String(value) === value;
 
 export const normalizeTerminalShell = (value) => {
   if (typeof value !== 'string') return null;
@@ -24,6 +25,22 @@ export const getTerminalShellLoginArgs = (executable, platform = process.platfor
   return null;
 };
 
+export const buildTerminalShellLaunch = (executable, { mode = 'interactive', command = null, loginShell = false, platform = process.platform } = {}) => {
+  const loginArgs = loginShell ? getTerminalShellLoginArgs(executable, platform) : [];
+  if (!loginArgs) throw new Error(`Terminal shell "${shellIdFromPath(executable) ?? executable}" does not support login mode`);
+
+  if (mode === 'interactive') return { executable, args: loginArgs };
+
+  const trimmedCommand = isString(command) ? command.trim() : '';
+  if (!trimmedCommand) throw new Error('Terminal command is required');
+
+  const id = shellIdFromPath(executable);
+  if (id === 'nu') return { executable, args: [...loginArgs, '-c', trimmedCommand] };
+  if (id === 'pwsh' || id === 'powershell') return { executable, args: [...loginArgs, '-Command', trimmedCommand] };
+  if (id === 'cmd') return { executable, args: ['/d', '/s', '/c', trimmedCommand] };
+  return { executable, args: [...loginArgs, '-i', '-c', trimmedCommand] };
+};
+
 export const createTerminalShellResolver = ({ fs, path, searchPathFor, isExecutable, buildAugmentedPath = () => env.PATH || '', platform = process.platform, env = process.env }) => {
   const resolveExecutable = (candidate) => {
     if (!candidate) return null;
@@ -35,7 +52,7 @@ export const createTerminalShellResolver = ({ fs, path, searchPathFor, isExecuta
 
   const defaultCandidates = () => platform === 'win32'
     ? [
-        env.OPENCHAMBER_TERMINAL_SHELL,
+        env.AIWORKER_TERMINAL_SHELL,
         env.SHELL,
         env.ComSpec,
         path.join(env.SystemRoot || 'C:\\Windows', 'System32', 'WindowsPowerShell', 'v1.0', 'powershell.exe'),
@@ -43,7 +60,7 @@ export const createTerminalShellResolver = ({ fs, path, searchPathFor, isExecuta
         'powershell.exe',
         'cmd.exe',
       ]
-    : [env.OPENCHAMBER_TERMINAL_SHELL, env.SHELL, '/bin/zsh', '/bin/bash', '/bin/sh', 'zsh', 'bash', 'sh'];
+    : [env.AIWORKER_TERMINAL_SHELL, env.SHELL, '/bin/zsh', '/bin/bash', '/bin/sh', 'zsh', 'bash', 'sh'];
 
   const resolveCandidates = (candidates) => {
     const seen = new Set();
@@ -68,7 +85,7 @@ export const createTerminalShellResolver = ({ fs, path, searchPathFor, isExecuta
 
     const candidates = platform === 'win32'
       ? [...defaultCandidates(), ...TERMINAL_SHELL_IDS]
-      : [env.OPENCHAMBER_TERMINAL_SHELL, env.SHELL, ...configuredShells, ...TERMINAL_SHELL_IDS, '/bin/zsh', '/bin/bash', '/bin/sh'];
+      : [env.AIWORKER_TERMINAL_SHELL, env.SHELL, ...configuredShells, ...TERMINAL_SHELL_IDS, '/bin/zsh', '/bin/bash', '/bin/sh'];
     const autoExecutable = resolveCandidates(defaultCandidates())[0] ?? null;
     const byId = new Map([
       ['auto', {

package/server/lib/terminal/shells.test.js

@@ -1,6 +1,8 @@
 import { describe, expect, it } from 'vitest';
 
-import { createTerminalShellResolver, getTerminalShellLoginArgs } from './shells.js';
+import * as shells from './shells.js';
+
+const { createTerminalShellResolver, getTerminalShellLoginArgs } = shells;
 
 const createResolver = ({ platform = 'linux', env = {}, augmentedPath = '/augmented/bin', executables = [] } = {}) => {
   const available = new Set(executables);
@@ -55,7 +57,7 @@ describe('terminal shell resolver', () => {
 
   it('uses environment overrides before platform defaults for auto', async () => {
     const { resolver } = createResolver({
-      env: { OPENCHAMBER_TERMINAL_SHELL: '/custom/zsh', SHELL: '/bin/bash' },
+      env: { AIWORKER_TERMINAL_SHELL: '/custom/zsh', SHELL: '/bin/bash' },
       executables: ['/custom/zsh', '/bin/bash'],
     });
 
@@ -70,4 +72,33 @@ describe('terminal shell resolver', () => {
     expect(getTerminalShellLoginArgs('C:\\Program Files\\PowerShell\\7\\pwsh.exe', 'win32')).toBeNull();
     expect(getTerminalShellLoginArgs('/bin/dash', 'linux')).toBeNull();
   });
+
+  it('builds interactive shell launches by shell family', () => {
+    const buildLaunch = shells.buildTerminalShellLaunch;
+
+    expect(buildLaunch('/bin/bash', { mode: 'interactive', loginShell: true, platform: 'linux' })).toEqual({ executable: '/bin/bash', args: ['-l'] });
+    expect(buildLaunch('/opt/homebrew/bin/fish', { mode: 'interactive', loginShell: true, platform: 'darwin' })).toEqual({ executable: '/opt/homebrew/bin/fish', args: ['--login'] });
+    expect(buildLaunch('/usr/bin/nu', { mode: 'interactive', loginShell: true, platform: 'linux' })).toEqual({ executable: '/usr/bin/nu', args: ['--login'] });
+    expect(buildLaunch('/usr/bin/pwsh', { mode: 'interactive', loginShell: true, platform: 'linux' })).toEqual({ executable: '/usr/bin/pwsh', args: ['-Login'] });
+    expect(buildLaunch('C:\\Windows\\System32\\cmd.exe', { mode: 'interactive', loginShell: false, platform: 'win32' })).toEqual({ executable: 'C:\\Windows\\System32\\cmd.exe', args: [] });
+  });
+
+  it('builds command launches by shell family', () => {
+    const buildLaunch = shells.buildTerminalShellLaunch;
+
+    expect(buildLaunch('/bin/zsh', { mode: 'command', command: 'printf ready', loginShell: true, platform: 'linux' })).toEqual({ executable: '/bin/zsh', args: ['-l', '-i', '-c', 'printf ready'] });
+    expect(buildLaunch('/opt/homebrew/bin/fish', { mode: 'command', command: 'echo ready', loginShell: true, platform: 'darwin' })).toEqual({ executable: '/opt/homebrew/bin/fish', args: ['--login', '-i', '-c', 'echo ready'] });
+    expect(buildLaunch('/usr/bin/nu', { mode: 'command', command: 'ls', loginShell: true, platform: 'linux' })).toEqual({ executable: '/usr/bin/nu', args: ['--login', '-c', 'ls'] });
+    expect(buildLaunch('/usr/bin/pwsh', { mode: 'command', command: 'Get-ChildItem', loginShell: true, platform: 'linux' })).toEqual({ executable: '/usr/bin/pwsh', args: ['-Login', '-Command', 'Get-ChildItem'] });
+    expect(buildLaunch('C:\\Program Files\\PowerShell\\7\\pwsh.exe', { mode: 'command', command: 'Get-Date', loginShell: false, platform: 'win32' })).toEqual({ executable: 'C:\\Program Files\\PowerShell\\7\\pwsh.exe', args: ['-Command', 'Get-Date'] });
+    expect(buildLaunch('C:\\Windows\\System32\\cmd.exe', { mode: 'command', command: 'dir', loginShell: false, platform: 'win32' })).toEqual({ executable: 'C:\\Windows\\System32\\cmd.exe', args: ['/d', '/s', '/c', 'dir'] });
+  });
+
+  it('rejects unsupported login and command combinations', () => {
+    const buildLaunch = shells.buildTerminalShellLaunch;
+
+    expect(() => buildLaunch('/bin/sh', { mode: 'interactive', loginShell: true, platform: 'linux' })).toThrow('does not support login mode');
+    expect(() => buildLaunch('/bin/dash', { mode: 'command', command: 'pwd', loginShell: true, platform: 'linux' })).toThrow('does not support login mode');
+    expect(() => buildLaunch('/bin/bash', { mode: 'command', command: '', loginShell: false, platform: 'linux' })).toThrow('Terminal command is required');
+  });
 });

package/server/lib/tts/base-url.js

@@ -47,13 +47,13 @@ export const normalizeCustomOpenAIBaseURL = (value) => {
     return { error: 'Custom server URL must not include credentials' };
   }
 
-  const isDesktop = (process.env.OPENCHAMBER_RUNTIME || '').trim().toLowerCase() === 'desktop';
-  const envFlagRaw = process.env.OPENCHAMBER_ALLOW_REMOTE_OPENAI_COMPAT_URLS;
+  const isDesktop = (process.env.AIWORKER_RUNTIME || '').trim().toLowerCase() === 'desktop';
+  const envFlagRaw = process.env.AIWORKER_ALLOW_REMOTE_OPENAI_COMPAT_URLS;
   const hasExplicitFlag = typeof envFlagRaw === 'string' && envFlagRaw.trim().length > 0;
   const allowRemote = hasExplicitFlag ? isEnvFlagEnabled(envFlagRaw) : isDesktop;
   if (!allowRemote && !isAllowedLocalHost(parsed.hostname)) {
     return {
-      error: 'Remote custom server URLs are disabled. Set OPENCHAMBER_ALLOW_REMOTE_OPENAI_COMPAT_URLS=true to allow this host.',
+      error: 'Remote custom server URLs are disabled. Set AIWORKER_ALLOW_REMOTE_OPENAI_COMPAT_URLS=true to allow this host.',
     };
   }
 

package/server/lib/tts/routes.test.js

@@ -97,44 +97,44 @@ describe('tts routes', () => {
 });
 
 describe('normalizeCustomOpenAIBaseURL', () => {
-  const originalRuntime = process.env.OPENCHAMBER_RUNTIME;
-  const originalAllowRemote = process.env.OPENCHAMBER_ALLOW_REMOTE_OPENAI_COMPAT_URLS;
+  const originalRuntime = process.env.AIWORKER_RUNTIME;
+  const originalAllowRemote = process.env.AIWORKER_ALLOW_REMOTE_OPENAI_COMPAT_URLS;
 
   afterEach(() => {
     // Restore env vars after each test
     if (originalRuntime === undefined) {
-      delete process.env.OPENCHAMBER_RUNTIME;
+      delete process.env.AIWORKER_RUNTIME;
     } else {
-      process.env.OPENCHAMBER_RUNTIME = originalRuntime;
+      process.env.AIWORKER_RUNTIME = originalRuntime;
     }
     if (originalAllowRemote === undefined) {
-      delete process.env.OPENCHAMBER_ALLOW_REMOTE_OPENAI_COMPAT_URLS;
+      delete process.env.AIWORKER_ALLOW_REMOTE_OPENAI_COMPAT_URLS;
     } else {
-      process.env.OPENCHAMBER_ALLOW_REMOTE_OPENAI_COMPAT_URLS = originalAllowRemote;
+      process.env.AIWORKER_ALLOW_REMOTE_OPENAI_COMPAT_URLS = originalAllowRemote;
     }
   });
 
-  it('rejects remote URLs when OPENCHAMBER_RUNTIME is not set (web)', () => {
-    delete process.env.OPENCHAMBER_RUNTIME;
-    delete process.env.OPENCHAMBER_ALLOW_REMOTE_OPENAI_COMPAT_URLS;
+  it('rejects remote URLs when AIWORKER_RUNTIME is not set (web)', () => {
+    delete process.env.AIWORKER_RUNTIME;
+    delete process.env.AIWORKER_ALLOW_REMOTE_OPENAI_COMPAT_URLS;
 
     const result = normalizeCustomOpenAIBaseURL('https://my-tts-server.example.com/v1');
     expect(result.error).toMatch(/Remote custom server URLs are disabled/);
     expect(result.value).toBeUndefined();
   });
 
-  it('allows remote URLs when OPENCHAMBER_RUNTIME is desktop', () => {
-    process.env.OPENCHAMBER_RUNTIME = 'desktop';
-    delete process.env.OPENCHAMBER_ALLOW_REMOTE_OPENAI_COMPAT_URLS;
+  it('allows remote URLs when AIWORKER_RUNTIME is desktop', () => {
+    process.env.AIWORKER_RUNTIME = 'desktop';
+    delete process.env.AIWORKER_ALLOW_REMOTE_OPENAI_COMPAT_URLS;
 
     const result = normalizeCustomOpenAIBaseURL('https://my-tts-server.example.com/v1');
     expect(result.error).toBeUndefined();
     expect(result.value).toBe('https://my-tts-server.example.com/v1');
   });
 
-  it('allows remote URLs when OPENCHAMBER_ALLOW_REMOTE_OPENAI_COMPAT_URLS is true', () => {
-    delete process.env.OPENCHAMBER_RUNTIME;
-    process.env.OPENCHAMBER_ALLOW_REMOTE_OPENAI_COMPAT_URLS = 'true';
+  it('allows remote URLs when AIWORKER_ALLOW_REMOTE_OPENAI_COMPAT_URLS is true', () => {
+    delete process.env.AIWORKER_RUNTIME;
+    process.env.AIWORKER_ALLOW_REMOTE_OPENAI_COMPAT_URLS = 'true';
 
     const result = normalizeCustomOpenAIBaseURL('https://my-tts-server.example.com/v1');
     expect(result.error).toBeUndefined();
@@ -142,8 +142,8 @@ describe('normalizeCustomOpenAIBaseURL', () => {
   });
 
   it('allows localhost URLs regardless of runtime', () => {
-    delete process.env.OPENCHAMBER_RUNTIME;
-    delete process.env.OPENCHAMBER_ALLOW_REMOTE_OPENAI_COMPAT_URLS;
+    delete process.env.AIWORKER_RUNTIME;
+    delete process.env.AIWORKER_ALLOW_REMOTE_OPENAI_COMPAT_URLS;
 
     const result = normalizeCustomOpenAIBaseURL('http://localhost:8880/v1');
     expect(result.error).toBeUndefined();
@@ -151,15 +151,15 @@ describe('normalizeCustomOpenAIBaseURL', () => {
   });
 
   it('strips query strings and trailing slashes', () => {
-    process.env.OPENCHAMBER_RUNTIME = 'desktop';
+    process.env.AIWORKER_RUNTIME = 'desktop';
 
     const result = normalizeCustomOpenAIBaseURL('https://my-server.com/v1/?key=123');
     expect(result.value).toBe('https://my-server.com/v1');
   });
 
   it('denies remote URLs on desktop when env var is explicitly false', () => {
-    process.env.OPENCHAMBER_RUNTIME = 'desktop';
-    process.env.OPENCHAMBER_ALLOW_REMOTE_OPENAI_COMPAT_URLS = 'false';
+    process.env.AIWORKER_RUNTIME = 'desktop';
+    process.env.AIWORKER_ALLOW_REMOTE_OPENAI_COMPAT_URLS = 'false';
 
     const result = normalizeCustomOpenAIBaseURL('https://my-tts-server.example.com/v1');
     expect(result.error).toMatch(/Remote custom server URLs are disabled/);

package/server/lib/ui-auth/ui-auth.js

@@ -12,10 +12,10 @@ const URL_AUTH_TOKEN_TTL_MS = 60 * 1000;
 const URL_AUTH_TOKEN_PREFIX = 'oc_url_';
 
 const RATE_LIMIT_WINDOW_MS = 5 * 60 * 1000;
-const RATE_LIMIT_MAX_ATTEMPTS = Number(process.env.OPENCHAMBER_RATE_LIMIT_MAX_ATTEMPTS) || 10;
+const RATE_LIMIT_MAX_ATTEMPTS = Number(process.env.AIWORKER_RATE_LIMIT_MAX_ATTEMPTS) || 10;
 const RATE_LIMIT_LOCKOUT_MS = 15 * 60 * 1000;
 const RATE_LIMIT_CLEANUP_MS = 60 * 60 * 1000;
-const RATE_LIMIT_NO_IP_MAX_ATTEMPTS = Number(process.env.OPENCHAMBER_RATE_LIMIT_NO_IP_MAX_ATTEMPTS) || 3;
+const RATE_LIMIT_NO_IP_MAX_ATTEMPTS = Number(process.env.AIWORKER_RATE_LIMIT_NO_IP_MAX_ATTEMPTS) || 3;
 
 const loginRateLimiter = new Map();
 let rateLimitCleanupTimer = null;
@@ -310,6 +310,7 @@ const isUrlAuthWebSocketPath = (pathname) => {
     || pathname === '/api/openchamber/realtime-proxy/ws'
     || pathname === '/api/terminal/ws'
     || pathname === '/api/dictation/ws'
+    || pathname === '/api/dev-tunnel'
     || pathname.startsWith('/api/preview/proxy/');
 };
 
@@ -361,10 +362,10 @@ const normalizePassword = (candidate) => {
 
 const isTrustedDeviceRequest = (value) => value === true;
 
-const OPENCHAMBER_DATA_DIR = process.env.OPENCHAMBER_DATA_DIR
-  ? path.resolve(process.env.OPENCHAMBER_DATA_DIR)
-  : path.join(os.homedir(), '.config', 'openchamber');
-const JWT_SECRET_FILE = path.join(OPENCHAMBER_DATA_DIR, 'jwt-secret');
+const AIWORKER_DATA_DIR = process.env.AIWORKER_DATA_DIR
+  ? path.resolve(process.env.AIWORKER_DATA_DIR)
+  : path.join(os.homedir(), '.config', 'aiworker');
+const JWT_SECRET_FILE = path.join(AIWORKER_DATA_DIR, 'jwt-secret');
 
 function getOrCreateJwtSecret() {
   const envSecret = process.env.OPENCODE_JWT_SECRET;
@@ -382,7 +383,7 @@ function getOrCreateJwtSecret() {
 
   const secret = crypto.randomBytes(32).toString('hex');
   try {
-    fs.mkdirSync(OPENCHAMBER_DATA_DIR, { recursive: true });
+    fs.mkdirSync(AIWORKER_DATA_DIR, { recursive: true });
     fs.writeFileSync(JWT_SECRET_FILE, secret, { mode: 0o600 });
     console.log('[JWT] Generated and persisted new secret to', JWT_SECRET_FILE);
   } catch (e) {
@@ -399,7 +400,7 @@ function persistJwtSecret(secret) {
     throw error;
   }
 
-  fs.mkdirSync(OPENCHAMBER_DATA_DIR, { recursive: true });
+  fs.mkdirSync(AIWORKER_DATA_DIR, { recursive: true });
   fs.writeFileSync(JWT_SECRET_FILE, secret, { mode: 0o600 });
   return new TextEncoder().encode(secret);
 }
@@ -984,7 +985,9 @@ export const createUiAuth = ({
     handlePasskeyList,
     handlePasskeyRevoke,
     handleResetAuth,
-    ensureSessionToken: async (req, _res) => {
+    ensureSessionToken: (req, _res) => {
+      const urlAuth = authenticateUrlAuthToken(req);
+      if (urlAuth) return clientSessionToken(urlAuth);
       return resolveAuthenticatedSessionToken(req);
     },
     dispose,

package/server/lib/ui-auth/ui-auth.test.js

@@ -4,7 +4,7 @@ import os from 'node:os';
 import path from 'node:path';
 
 const dataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'openchamber-ui-auth-test-'));
-process.env.OPENCHAMBER_DATA_DIR = dataDir;
+process.env.AIWORKER_DATA_DIR = dataDir;
 
 afterAll(() => {
   fs.rmSync(dataDir, { recursive: true, force: true });
@@ -221,6 +221,22 @@ describe('ui auth client credential seam', () => {
     };
     expect(await auth.ensureSessionToken(dictationWsReq, null)).toBe('client:device-1');
 
+    const devTunnelWsReq = {
+      method: 'GET',
+      path: '/api/dev-tunnel',
+      url: `/api/dev-tunnel?port=4322&oc_url_token=${encodeURIComponent(urlToken)}`,
+      headers: { upgrade: 'websocket' },
+    };
+    expect(await auth.ensureSessionToken(devTunnelWsReq, null)).toBe('client:device-1');
+
+    const devTunnelSubpathWsReq = {
+      method: 'GET',
+      path: '/api/dev-tunnel/private',
+      url: `/api/dev-tunnel/private?port=4322&oc_url_token=${encodeURIComponent(urlToken)}`,
+      headers: { upgrade: 'websocket' },
+    };
+    expect(await auth.ensureSessionToken(devTunnelSubpathWsReq, null)).toBe(null);
+
     const dictationHttpReq = {
       method: 'GET',
       path: '/api/dictation/ws',
@@ -287,7 +303,7 @@ describe('ui auth client credential seam', () => {
       body: {
         password: 'secret',
         issueClientToken: true,
-        clientLabel: 'OpenChamber Desktop',
+        clientLabel: 'AiWorker Desktop',
       },
     };
     const res = createResponse();
@@ -295,7 +311,7 @@ describe('ui auth client credential seam', () => {
     await auth.handleSessionCreate(req, res);
 
     expect(res.body.clientToken).toBe('client-token');
-    expect(createClientInput.fallbackLabel).toBe('OpenChamber Desktop');
+    expect(createClientInput.fallbackLabel).toBe('AiWorker Desktop');
     const expiresAt = Date.parse(createClientInput.expiresAt);
     expect(expiresAt).toBeGreaterThanOrEqual(before + 122_000);
     expect(expiresAt).toBeLessThanOrEqual(Date.now() + 124_000);

package/server/lib/ui-auth/ui-passkeys.js

@@ -11,13 +11,13 @@ import {
 
 const DEFAULT_STORE_VERSION = 1;
 const DEFAULT_CHALLENGE_TTL_MS = 5 * 60 * 1000;
-const DEFAULT_RP_NAME = 'OpenChamber';
+const DEFAULT_RP_NAME = 'AiWorker';
 
-const OPENCHAMBER_DATA_DIR = process.env.OPENCHAMBER_DATA_DIR
-  ? path.resolve(process.env.OPENCHAMBER_DATA_DIR)
-  : path.join(os.homedir(), '.config', 'openchamber');
+const AIWORKER_DATA_DIR = process.env.AIWORKER_DATA_DIR
+  ? path.resolve(process.env.AIWORKER_DATA_DIR)
+  : path.join(os.homedir(), '.config', 'aiworker');
 
-const PASSKEY_STORE_FILE = path.join(OPENCHAMBER_DATA_DIR, 'ui-passkeys.json');
+const PASSKEY_STORE_FILE = path.join(AIWORKER_DATA_DIR, 'ui-passkeys.json');
 
 const createUserId = () => crypto.randomBytes(32).toString('base64url');
 
@@ -331,7 +331,7 @@ export const createUiPasskeys = ({
       rpID,
       userID,
       userName: 'openchamber-ui',
-      userDisplayName: 'OpenChamber UI',
+      userDisplayName: 'AiWorker UI',
       attestationType: 'none',
       excludeCredentials: getPasskeysForRpId(store, rpID).map((passkey) => ({
         id: passkey.id,
@@ -471,7 +471,7 @@ export const createUiPasskeys = ({
     const passkey = store.passkeys.find((item) => item.id === response?.id);
 
     if (!passkey) {
-      const error = new Error('That passkey is not registered for this OpenChamber instance');
+      const error = new Error('That passkey is not registered for this AiWorker instance');
       error.statusCode = 404;
       throw error;
     }

package/server/lib/walkthrough/DOCUMENTATION.md

@@ -52,20 +52,39 @@ written against staged code never silently re-anchors onto an unstaged edit.
 | Kind | Sections | Notes |
 |---|---|---|
 | `working-tree` (`all` \| `staged` \| `working`) | `staged`, `working` | Untracked files are fetched individually because `git diff` omits them |
-| `branch` | `branch` | `getRangeDiff` uses three-dot `base...head`, so work merged in from the base branch is excluded |
-| `pr` | `pr:<number>` | GitHub returns the merge-base diff, matching the branch semantics |
-
-For the current-branch source, the UI takes the base from the default branch of
-the current branch's tracking remote (`defaultBranches` in the branches
-response), and only then falls back to the conventional names. It does not offer
-the source at all when the chosen base exists neither locally nor on a remote —
-a repository whose default is neither `main`, `master` nor `develop` used to be
-handed `main...<head>`, which git rejects outright.
-
-A base that exists only on a remote still works: `getRangeDiff` prefers
-`origin/<base>` when it exists, and otherwise resolves the base through whichever
-remote carries it, because a bare branch name git cannot find in `refs/heads`
-fails the same way.
+| `branch` | `branch` | `getRangeDiff` with `includeWorkingTree: true` compares the selected merge base with current files, including committed and local work in one net diff |
+| `commit` | `commit` | `getCommitDiff` compares the full selected commit hash with its first parent; root commits compare with an empty tree |
+| `pr` | `pr:<number>` | GitHub's committed pull-request diff, without local working-tree changes |
+
+Changes and walkthrough resolve the current branch's base through
+`packages/ui/src/hooks/useBranchComparisonBase.ts`. An explicit choice in Changes
+outranks reflog detection. Both toolbars use
+`packages/ui/src/components/views/git/BranchComparisonSelector.tsx` to select or
+change the base directly. Walkthrough allows selecting Branch before a base is
+known and waits for a valid choice before loading or generating. Opening
+walkthrough from Changes carries the selected base and head; later selections
+in either toolbar update both comparisons.
+
+Commit mode uses the shared `CommitComparisonSelector` in both toolbars. It
+lists the latest 50 commits reachable from the checked-out branch, with subject,
+author, date, and short hash. Opening the picker refreshes that list; selecting a
+commit changes the comparison, not the checkout. Changes hands the selected full
+hash to walkthrough. The server accepts full object IDs for commit sources and
+keys their cache entries and generation jobs as `commit:<hash>`, so reviews of
+different commits cannot overwrite each other. Existing source keys keep their
+format. Commit reads have no working-tree freshness dependency, and selecting a
+commit never starts model generation.
+
+The Git module owns exact-ref and working-tree comparison semantics. Local and
+remote bases remain distinct, and a checkout during a branch review requires
+the source to be resolved for the new branch rather than including another
+branch's local files.
+
+Successful status refreshes invalidate the visible branch comparison even when
+file names and insertion/deletion counts stay the same. Walkthrough refreshes
+its current hunk index while visible; regeneration remains user-initiated. The
+content-addressed cache continues to reuse an old review only when its hunks
+match, and otherwise reports stale anchors and uncovered current hunks.
 
 The panel offers the current branch's pull request on its own: it registers with
 the shared GitHub PR status store (`useGitHubPrStatusStore`) rather than waiting

package/server/lib/walkthrough/index.js

@@ -474,6 +474,7 @@ async function runGeneration({ directory, source, repoRoot, key, force, explicit
     prompt: options.prompt,
     system: options.system,
     directory,
+    sessionID: `openchamber-walkthrough-${cacheKey}`,
     model: `${model.providerID}/${model.modelID}`,
     responseSchema: options.responseSchema,
     onOverflow: 'error',

package/server/lib/walkthrough/jobs.test.js

@@ -4,7 +4,7 @@ import path from 'path';
 import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 const TEMP_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), 'walkthrough-jobs-'));
-process.env.OPENCHAMBER_DATA_DIR = TEMP_DATA_DIR;
+process.env.AIWORKER_DATA_DIR = TEMP_DATA_DIR;
 
 // Mocking git rather than this module's own source loading: fewer of our own
 // seams faked means the test exercises the real digest and prompt path.

package/server/lib/walkthrough/language.test.js

@@ -4,7 +4,7 @@ import path from 'path';
 import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
 const TEMP_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), 'walkthrough-language-'));
-process.env.OPENCHAMBER_DATA_DIR = TEMP_DATA_DIR;
+process.env.AIWORKER_DATA_DIR = TEMP_DATA_DIR;
 
 vi.mock('../git/service.js', () => ({
   getRepositoryRoot: vi.fn(async () => '/repo'),

package/server/lib/walkthrough/model-settings.js

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
+import { readMergedSettingsSync } from '../opencode/settings-files.js';
 
 // The walkthrough may run on a different model than the rest of the small-model
 // callers. Those callers want cheap and fast; this one needs structured output
@@ -8,9 +9,9 @@ import path from 'path';
 // means the user has to degrade one feature to fix the other.
 
 const SETTINGS_FILE = path.join(
-  process.env.OPENCHAMBER_DATA_DIR
-    ? path.resolve(process.env.OPENCHAMBER_DATA_DIR)
-    : path.join(os.homedir(), '.config', 'openchamber'),
+  process.env.AIWORKER_DATA_DIR
+    ? path.resolve(process.env.AIWORKER_DATA_DIR)
+    : path.join(os.homedir(), '.config', 'aiworker'),
   'settings.json',
 );
 
@@ -23,16 +24,11 @@ const SETTINGS_FILE = path.join(
  * not use the small model" with nothing to use instead.
  */
 export function readWalkthroughModelOverride() {
-  try {
-    const settings = JSON.parse(fs.readFileSync(SETTINGS_FILE, 'utf8'));
-    if (!settings || typeof settings !== 'object') return null;
-    const override = typeof settings.walkthroughModelOverride === 'string'
-      ? settings.walkthroughModelOverride.trim()
-      : '';
-    return override || null;
-  } catch {
-    // No settings file, unreadable, or malformed all mean the same thing: no
-    // override, use the small model.
-    return null;
-  }
+  // No settings file, unreadable, or malformed all mean the same thing: no
+  // override, use the small model.
+  const settings = readMergedSettingsSync({ fs, path, settingsFilePath: SETTINGS_FILE });
+  const override = typeof settings.walkthroughModelOverride === 'string'
+    ? settings.walkthroughModelOverride.trim()
+    : '';
+  return override || null;
 }

package/server/lib/walkthrough/model-settings.test.js

@@ -4,7 +4,7 @@ import path from 'path';
 import { afterAll, beforeEach, describe, expect, it } from 'vitest';
 
 const TEMP_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), 'walkthrough-model-settings-'));
-process.env.OPENCHAMBER_DATA_DIR = TEMP_DATA_DIR;
+process.env.AIWORKER_DATA_DIR = TEMP_DATA_DIR;
 
 const { readWalkthroughModelOverride } = await import('./model-settings.js');
 

package/server/lib/walkthrough/prompt.js

@@ -86,7 +86,9 @@ export function buildPrompt({ digest, fileCount, hunkCount, source, previousWalk
     ? `Uncommitted local changes (${source.scope === 'all' ? 'staged and unstaged' : source.scope}).`
     : source.kind === 'branch'
       ? `All work on branch "${source.headRef}" that is not in "${source.baseRef}". Changes merged in from ${source.baseRef} are already excluded.`
-      : `Pull request #${source.number}.`;
+      : source.kind === 'commit'
+        ? `Only the changes introduced by commit ${source.hash}, relative to its first parent (or the empty tree for a root commit).`
+        : `Pull request #${source.number}.`;
 
   const prompt = `Reviewing: ${sourceLine}
 

package/server/lib/walkthrough/pull-request.test.js

@@ -24,8 +24,8 @@ describe('getPullRequestDiff', () => {
     // wrapper made every repository look remote-less, which is what this suite
     // exists to prevent.
     resolveGitHubRepoFromDirectory.mockResolvedValue({
-      repo: { owner: 'openchamber', repo: 'openchamber' },
-      remoteUrl: 'git@github.com:openchamber/openchamber.git',
+      repo: { owner: 'aiworker', repo: 'aiworker' },
+      remoteUrl: 'git@github.com:aiworker/openchamber.git',
     });
   });
 
@@ -37,10 +37,10 @@ describe('getPullRequestDiff', () => {
     const result = await getPullRequestDiff('/repo', 2122);
 
     expect(result.patch).toBe(PATCH);
-    expect(result.meta).toEqual({ owner: 'openchamber', repo: 'openchamber', number: 2122 });
+    expect(result.meta).toEqual({ owner: 'aiworker', repo: 'aiworker', number: 2122 });
     expect(request).toHaveBeenCalledWith('GET /repos/{owner}/{repo}/pulls/{pull_number}', {
-      owner: 'openchamber',
-      repo: 'openchamber',
+      owner: 'aiworker',
+      repo: 'aiworker',
       pull_number: 2122,
       headers: { accept: 'application/vnd.github.v3.diff' },
     });

package/server/lib/walkthrough/reproduce-2607.test.js

@@ -6,7 +6,7 @@ import express from 'express';
 import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
 
 // ---------------------------------------------------------------------------
-// Regression for https://github.com/openchamber/openchamber/issues/2607
+// Regression for https://roweb.cn/roweb/openchamber/issues/2607
 // "[Bug] Why say so?" (walkthrough panel)
 //
 // Before the fix, a walkthrough small model whose provider had no usable login
@@ -20,7 +20,7 @@ import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
 
 const TEMP_HOME = fs.mkdtempSync(path.join(os.tmpdir(), 'oc-home-2607-'));
 process.env.HOME = TEMP_HOME;
-process.env.OPENCHAMBER_DATA_DIR = path.join(TEMP_HOME, '.config', 'openchamber');
+process.env.AIWORKER_DATA_DIR = path.join(TEMP_HOME, '.config', 'aiworker');
 
 const CATALOG = {
   deepseek: {