@superjackfruitlabs/salaam 0.0.4 → 0.0.5

package/src/cli.ts

@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+import { loadDangerClassifierOptions } from './danger-classifier.js';
+import { loadWebSearchConfig } from './web-search.js';
 import { SANDBOX_LEVELS, type SandboxLevel } from './command-sandbox.js';
 import { acp } from './acp.js';
 import { homedir } from 'node:os';
@@ -67,6 +69,10 @@ async function main(): Promise<void> {
     console.log('salaam ' + VERSION);
     return;
   }
+  if (args[0] === '-c' || args[0] === '--continue') {
+    const { continueArgs } = await import('./session-pick.js');
+    args.splice(0, args.length, ...continueArgs(args)!);
+  }
   if (args[0] === 'mcp') {
     // Parsed before global help: a declared command's own flags follow "--".
     const rest = args.slice(1);
@@ -517,7 +523,11 @@ async function main(): Promise<void> {
       hostToolsUser,
       hostApprovalTtlMs,
       hostAllowsUnsandboxed,
+      hostAllowsFullAccessSessions,
+      hostAllowsYoloSessions,
+      hostDangerClassifier,
       hostCommandNetwork,
+      hostReadPaths,
     } = await import('./host.js');
     if (verb?.startsWith('config-')) {
       const file = option('--manifest');
@@ -661,7 +671,18 @@ async function main(): Promise<void> {
           providerRoute: m.provider,
           approvalTtlMs: hostApprovalTtlMs(m),
           ...(hostAllowsUnsandboxed(m) ? { unsandboxedCommands: 'allow' as const } : {}),
+          // A host session may choose full access only when the reviewed manifest says so.
+          allowFullAccessSessions: hostAllowsFullAccessSessions(m),
+          allowYoloSessions: hostAllowsYoloSessions(m),
+          // The command reviewer only as the reviewed manifest names it (forbidden when absent).
+          ...(hostDangerClassifier(m).config
+            ? { dangerClassifierConfig: hostDangerClassifier(m).config }
+            : {}),
+          ...(hostDangerClassifier(m).pin
+            ? { dangerClassifierPin: hostDangerClassifier(m).pin }
+            : {}),
           ...(hostCommandNetwork(m) ? { commandNetwork: hostCommandNetwork(m)! } : {}),
+          ...(hostReadPaths(m).length ? { localSandboxReadPaths: hostReadPaths(m) } : {}),
         });
       if (process.connected) process.once('disconnect', () => void service.close());
       for (const signal of ['SIGTERM', 'SIGINT'] as const)
@@ -688,6 +709,20 @@ async function main(): Promise<void> {
     });
     return;
   }
+  if (group === 'code' || group === 'here') {
+    const { parseCodeStart } = await import('./session-pick.js');
+    const start = parseCodeStart(args.slice(1));
+    const { tui } = await import('./tui.js');
+    await tui({
+      state,
+      start,
+      cwd: option('--cwd'),
+      takeover: args.includes('--takeover'),
+      codingRoot: option('--coding-root'),
+      codingSocket: option('--coding-socket'),
+    });
+    return;
+  }
   if (
     !group ||
     group === 'tui' ||
@@ -841,7 +876,7 @@ async function main(): Promise<void> {
     return;
   }
   if (group === 'acp') {
-    await acp(state, { coding: args.includes('--coding') });
+    await acp(state, { coding: args.includes('--coding'), local: args.includes('--local') });
     return;
   }
   if (group === 'providers' && verb === 'list') {
@@ -1634,7 +1669,26 @@ async function main(): Promise<void> {
       toolsUser = option('--tools-user') ?? (process.env.SALAAM_TOOLS_USER || undefined),
       localSandbox = option('--local-sandbox') ?? (process.env.SALAAM_LOCAL_SANDBOX || undefined),
       unsandboxedCommands =
-        option('--unsandboxed-commands') ?? (process.env.SALAAM_UNSANDBOXED_COMMANDS || undefined);
+        option('--unsandboxed-commands') ?? (process.env.SALAAM_UNSANDBOXED_COMMANDS || undefined),
+      localSandboxRead = (
+        option('--local-sandbox-read') ??
+        (process.env.SALAAM_LOCAL_SANDBOX_READ || '')
+      )
+        .split(',')
+        .map((p) => p.trim())
+        .filter(Boolean),
+      webSearchConfig =
+        option('--web-search-config') ?? (process.env.SALAAM_WEB_SEARCH_CONFIG || undefined),
+      dangerClassifierConfig =
+        option('--danger-classifier-config') ??
+        (process.env.SALAAM_DANGER_CLASSIFIER_CONFIG || undefined);
+    // Fail early on a bad command-reviewer config; its key is read from the named variable, never printed.
+    if (dangerClassifierConfig)
+      loadDangerClassifierOptions(
+        JSON.parse(readFileSync(resolve(dangerClassifierConfig), 'utf8')),
+      );
+    // Fail early on a bad web search config; its keys are read, never printed.
+    if (webSearchConfig) loadWebSearchConfig(resolve(webSearchConfig));
     if (localSandbox !== undefined && !(SANDBOX_LEVELS as readonly string[]).includes(localSandbox))
       throw Error('--local-sandbox is read-only, workspace-write or full-access');
     if (unsandboxedCommands !== undefined && unsandboxedCommands !== 'allow')
@@ -1653,6 +1707,11 @@ async function main(): Promise<void> {
         toolsUser,
         ...(localSandbox ? { localSandbox: localSandbox as SandboxLevel } : {}),
         ...(unsandboxedCommands ? { unsandboxedCommands: 'allow' as const } : {}),
+        ...(localSandboxRead.length ? { localSandboxReadPaths: localSandboxRead } : {}),
+        ...(webSearchConfig ? { webSearchConfig: resolve(webSearchConfig) } : {}),
+        ...(dangerClassifierConfig
+          ? { dangerClassifierConfig: resolve(dangerClassifierConfig) }
+          : {}),
         effectConnector: effectSocket
           ? new SocketEffectConnector(resolve(effectSocket), { opaque })
           : undefined,
@@ -1746,6 +1805,11 @@ async function main(): Promise<void> {
         ...(toolsUser ? ['--tools-user', toolsUser] : []),
         ...(localSandbox ? ['--local-sandbox', localSandbox] : []),
         ...(unsandboxedCommands ? ['--unsandboxed-commands', 'allow'] : []),
+        ...(localSandboxRead.length ? ['--local-sandbox-read', localSandboxRead.join(',')] : []),
+        ...(webSearchConfig ? ['--web-search-config', resolve(webSearchConfig)] : []),
+        ...(dangerClassifierConfig
+          ? ['--danger-classifier-config', resolve(dangerClassifierConfig)]
+          : []),
       ],
       { detached: true, stdio: ['ignore', fd, fd] },
     );