@bahulam/code 0.1.24 → 0.1.25

package/src/terminal/paste-input.mjs

@@ -21,3 +21,55 @@ export function pastedTextLabel(text) {
   if (lines > 1) return `[text copied · ${lines} lines]`;
   return '[text copied]';
 }
+
+function stripPastedPathQuotes(value) {
+  const text = String(value || '').trim();
+  if ((text.startsWith('"') && text.endsWith('"')) || (text.startsWith("'") && text.endsWith("'"))) {
+    return text.slice(1, -1);
+  }
+  return text;
+}
+
+export function clipboardPathCandidate(value) {
+  const text = stripPastedPathQuotes(value);
+  if (!text) return '';
+  if (text.startsWith('file://')) {
+    try {
+      return decodeURIComponent(new URL(text).pathname);
+    } catch {
+      return text;
+    }
+  }
+  return text;
+}
+
+export function quotedAttachmentReference(value) {
+  const text = clipboardPathCandidate(value);
+  if (!/[\s"'\\]/.test(text)) return `@${text}`;
+  return `@"${text.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
+}
+
+export function classifyPastedPromptPayload(payload, { looksLikeAttachmentReference = () => false } = {}) {
+  const text = normalizePastedText(payload || '');
+  if (!text) {
+    return { kind: 'clipboard_image', text: '@clipboard ', label: '[clipboard image]' };
+  }
+
+  const lines = text
+    .split('\n')
+    .map(line => line.trim())
+    .filter(Boolean);
+  if (lines.length && lines.every(line => looksLikeAttachmentReference(clipboardPathCandidate(line)))) {
+    return {
+      kind: lines.length === 1 ? 'clipboard_path' : 'clipboard_paths',
+      text: `${lines.map(quotedAttachmentReference).join('\n')} `,
+      label: lines.length === 1 ? '[clipboard path]' : `[clipboard paths · ${lines.length}]`,
+    };
+  }
+
+  return {
+    kind: 'clipboard_text',
+    text,
+    label: pastedTextLabel(text).replace('[text copied', '[clipboard text'),
+  };
+}

package/src/terminal/repl.mjs

@@ -23,6 +23,7 @@ import { Writable as _WritableStream } from 'node:stream';
 import { c, progressBar, spinner, inPlace, renderMarkdown, renderDiff, formatElapsed, formatCost, stripAnsi } from './ansi.mjs';
 import { calculateCost, formatCostValue, formatTokens, costToCredits, formatCredits } from '../core/pricing.mjs';
 import { BahulamStreamClient, EVENT_TYPES } from '../core/stream-client.mjs';
+import { LocalAgent } from '../core/local-agent.mjs';
 import { AgentHistoryTurnBuilder } from '../core/agent-history.mjs';
 import { JsonlWriter } from '../core/jsonl-writer.mjs';
 import { tapSseEvent, registerBroadcaster } from '../daemon/event-tap.mjs';
@@ -56,7 +57,7 @@ import { persistProjectArtifacts } from '../core/project-artifacts.mjs';
 import { BahulamAuth } from '../auth/bahulam-auth.mjs';
 import { ApprovalManager } from '../core/approval.mjs';
 import * as telemetry from '../telemetry/index.mjs';
-import { resolveBackendUrl } from '../core/backend-url.mjs';
+import { resolveBackendUrl, resolveGatewayUrl } from '../core/backend-url.mjs';
 import { formatMessageWindow, lowWindowStatus, messagesRemaining } from '../core/rate-limit-display.mjs';
 import { formatAgentErrorGuidance } from '../core/error-guidance.mjs';
 import { BUILTIN_AGENTS, runAgentDefinition } from './agents.mjs';
@@ -71,7 +72,7 @@ import { PluginRegistry } from '../plugins/registry.mjs';
 import { SessionManager } from '../core/session-manager.mjs';
 import { parseArgs } from '../config/cli-args.mjs';
 import { pickModelOverridesForm } from './repl-model-form.mjs';
-import { isRawMultilinePasteChunk, normalizePastedText, pastedTextLabel } from './paste-input.mjs';
+import { classifyPastedPromptPayload, isRawMultilinePasteChunk, pastedTextLabel } from './paste-input.mjs';
 import {
   MODEL_CATEGORY_ORDER,
   formatCategoryBadge,
@@ -82,6 +83,8 @@ import {
   normalizeCatalogCategory,
 } from './model-catalog-display.mjs';
 import { loadEffectivePolicy, formatPolicySourceRows } from '../core/policy-resolver.mjs';
+import { DEFAULT_REASONING_MODEL } from '../config/model-defaults.mjs';
+import { applyModelSelection, resolveModelSelection } from '../core/model-selection.mjs';
 import { loadProjectContext } from '../core/project-context-loader.mjs';
 import { buildContextEnvelope } from '../core/context-envelope.mjs';
 import { buildResumeHistory, combineResumeSummaries, getRecentSessions, getSessionDetail, getTranscriptProjectRoots } from '../core/local-store.mjs';
@@ -94,6 +97,7 @@ import {
   appendDocumentsToInstruction,
   attachmentSummaryLine,
   documentSummaryLine,
+  looksLikeAttachmentReference,
   prepareImageAttachments,
   prepareDocumentAttachments,
   publicAttachmentMetadata,
@@ -3306,14 +3310,14 @@ async function prepareDirectAgentRunContext(ctx, instruction = '') {
       projectResources,
     }),
   };
-  const modelOverrides = Object.fromEntries(sessionModelOverrideEntries());
-  if (Object.keys(modelOverrides).length > 0) {
-    execContext.model_overrides = modelOverrides;
-    if (modelOverrides.reasoning) execContext.model_override = modelOverrides.reasoning;
-  }
-  if (session.modelMode) execContext.model_mode = session.modelMode;
-  if (session.routePreference) execContext.model_route = session.routePreference;
-  return execContext;
+  const modelSelection = resolveModelSelection({
+    explicitModel: null,
+    modelOverrides: session.modelOverrides,
+    modelMode: session.modelMode,
+    modelRoute: session.routePreference,
+    profileModels: { reasoning: session.model },
+  });
+  return applyModelSelection(execContext, modelSelection);
 }
 
 function makeDispatchContext(ctx) {
@@ -3329,6 +3333,11 @@ function makeDispatchContext(ctx) {
       apiKey: process.env.ANTHROPIC_API_KEY || creds.anthropicKey || null,
       openRouterKey: process.env.OPENROUTER_API_KEY || creds.openRouterKey || null,
     },
+    modelTransport: ctx.runtimeMode === 'local' ? 'gateway' : 'direct',
+    gatewayUrl: ctx.runtimeMode === 'local' ? ctx.gatewayUrl : null,
+    gatewayToken: ctx.runtimeMode === 'local' ? creds.token : null,
+    sessionId: session.id || ctx.localSessionId,
+    defaultModel: session.model || cliArgs.model || null,
     cwd: safeCwd(),
   };
 }
@@ -4466,6 +4475,9 @@ export async function startTerminalRepl() {
   safeCwd(); // prime the cache in repl-utils.mjs for later recovery
 
   const cliArgs = parseArgs(process.argv.slice(2));
+  const runtimeMode = cliArgs.runtimeMode || 'local';
+  const gatewayUrl = resolveGatewayUrl();
+  const localSessionId = `local_${Date.now()}_${Math.random().toString(16).slice(2, 10)}`;
   const auth = new BahulamAuth();
 
   // Projects are registered and indexed on demand through get_project_overview.
@@ -4548,8 +4560,23 @@ export async function startTerminalRepl() {
 
   // Persistent stream client — session_id captured from backend on first turn
   let streamClient = null;
-
-  const ctx = { auth, toolExecutor: null, approval, jsonlWriter, sessionMgr, checkpoints, effectivePolicy, latestProjectContext, latestEnvelope, pendingVisionPaths: [] };
+  let activeLocalAgent = null;
+
+  const ctx = {
+    auth,
+    toolExecutor: null,
+    approval,
+    jsonlWriter,
+    sessionMgr,
+    checkpoints,
+    effectivePolicy,
+    latestProjectContext,
+    latestEnvelope,
+    pendingVisionPaths: [],
+    runtimeMode,
+    gatewayUrl,
+    localSessionId,
+  };
 
   // Wake-on-finish: background jobs with on_complete dispatch their target
   // agent through the trigger funnel when they exit. The ctx builder runs
@@ -5018,19 +5045,16 @@ export async function startTerminalRepl() {
     initialContentRow: dockCursor.row,
     initialContentCol: dockCursor.col,
   });
-  // 1 Hz live-tick for the elapsed clock in the dock's top strip.
-  // Only fires when the user is idle (inputActive === true) — while the
-  // agent is streaming content, skipping the tick avoids ANSI writes
-  // interleaving with the stream. Cheap: one renderIdleDockInput per
-  // second, only if mounted + idle. `unref()` so the timer never blocks
-  // process exit.
+  // 1 Hz live-tick for the elapsed clock in the dock's top strip. The render
+  // queue serializes dock paints with agent/tool output, so the clock must
+  // continue while the npm-owned local/direct loop is executing too.
+  // `unref()` ensures the timer never blocks process exit.
   let _dockTickTimer = null;
   if (inputDockActive) {
     process.on('beforeExit', unmountInputDock);
     process.on('exit',       unmountInputDock);
     _dockTickTimer = setInterval(() => {
       if (!isInputDockMounted()) return;
-      if (!inputActive) return;
       try { renderIdleDockInput(); } catch { /* one bad tick is not fatal */ }
     }, 1000);
     _dockTickTimer.unref?.();
@@ -5080,10 +5104,12 @@ export async function startTerminalRepl() {
               const baseCursor = typeof rl?.cursor === 'number' ? rl.cursor : baseLine.length;
               setImmediate(() => {
                 try {
-                  insertPromptText(normalizePastedText(s), {
+                  const pasted = classifyPastedPromptPayload(s, { looksLikeAttachmentReference });
+                  insertPromptText(pasted.text, {
                     baseLine,
                     baseCursor,
                     fromPaste: true,
+                    pasteLabel: pasted.label,
                   });
                 } finally {
                   _suppressRawPasteLines = false;
@@ -5150,7 +5176,7 @@ export async function startTerminalRepl() {
   }
 
   function idleInputTips() {
-    return '[Enter] send  [/] commands  [Tab] complete  [F2] details';
+    return '[Enter] send  [/] commands  [Tab] complete  [@clipboard] image  [F2] details';
   }
 
   function executionInputTips() {
@@ -5347,7 +5373,7 @@ export async function startTerminalRepl() {
     }
   }
 
-  function insertPromptText(text, { baseLine = rl.line || '', baseCursor = rl.cursor, fromPaste = false } = {}) {
+  function insertPromptText(text, { baseLine = rl.line || '', baseCursor = rl.cursor, fromPaste = false, pasteLabel = null } = {}) {
     const payload = String(text || '');
     if (!payload) return;
     const line = String(baseLine || '');
@@ -5356,12 +5382,21 @@ export async function startTerminalRepl() {
     if (fromPaste) {
       _promptHasInsertedPaste = true;
       _pastedInputValue = next;
-      _pastedInputLabel = pastedTextLabel(payload);
+      _pastedInputLabel = pasteLabel || pastedTextLabel(payload);
     }
     replaceReadlineLine(next, cursor + payload.length);
     renderIdleDockInput();
   }
 
+  function insertClipboardImageReference({ baseLine = rl.line || '', baseCursor = rl.cursor, fromPaste = true } = {}) {
+    const line = String(baseLine || '');
+    const cursor = typeof baseCursor === 'number' ? Math.max(0, Math.min(line.length, baseCursor)) : line.length;
+    const needsLeadingSpace = cursor > 0 && !/\s/.test(line[cursor - 1]);
+    const needsTrailingSpace = cursor < line.length && !/\s/.test(line[cursor]);
+    const token = `${needsLeadingSpace ? ' ' : ''}@clipboard${needsTrailingSpace ? ' ' : ' '}`;
+    insertPromptText(token, { baseLine: line, baseCursor: cursor, fromPaste, pasteLabel: '[clipboard image]' });
+  }
+
   function acceptSlashHint() {
     const item = slashHintItems[slashHintSelected];
     if (!item) return false;
@@ -5468,6 +5503,10 @@ export async function startTerminalRepl() {
       if (!inputActive) return;
       if (_inBracketedPaste || _suppressBracketedPasteLines || _suppressRawPasteLines) return;
       if (key.name === 'return' || key.name === 'enter') return;
+      if (key.ctrl && key.name === 'v') {
+        insertClipboardImageReference();
+        return;
+      }
       if (key.name === 'f2') {
         clearSlashHint();
         if (isInputDockMounted()) moveToContent();
@@ -5537,11 +5576,11 @@ export async function startTerminalRepl() {
     const pastedLines = _pasteLines.slice();
     _pasteLines = [];
     if (pastedLines.length > 1 || trailing) {
-      const text = [...pastedLines, trailing].join('\n');
+      const pasted = classifyPastedPromptPayload([...pastedLines, trailing].join('\n'), { looksLikeAttachmentReference });
       _promptHasInsertedPaste = true;
-      _pastedInputValue = text;
-      _pastedInputLabel = pastedTextLabel(text);
-      replaceReadlineLine(text);
+      _pastedInputValue = pasted.text;
+      _pastedInputLabel = pasted.label;
+      replaceReadlineLine(pasted.text);
       renderIdleDockInput();
       return;
     }
@@ -5596,10 +5635,12 @@ export async function startTerminalRepl() {
     }
     // Readline has finished emitting synchronous `line` events by now.
     // Treat paste as editing the prompt buffer; Enter remains the submit.
-    insertPromptText(payload || '', {
+    const pasted = classifyPastedPromptPayload(payload, { looksLikeAttachmentReference });
+    insertPromptText(pasted.text, {
       baseLine: _bracketedPasteStartLine,
       baseCursor: _bracketedPasteStartCursor,
       fromPaste: true,
+      pasteLabel: pasted.label,
     });
   });
 
@@ -5649,27 +5690,83 @@ export async function startTerminalRepl() {
 
     const originalInput = input;
     const creds = auth.loadCredentials();
-    if (!creds.token) {
+    const anthKey = process.env.ANTHROPIC_API_KEY || creds.anthropicKey;
+    const openRouterKey = process.env.OPENROUTER_API_KEY || creds.openRouterKey;
+    if ((runtimeMode === 'remote' || runtimeMode === 'bundled' || runtimeMode === 'local') && !creds.token) {
       process.stderr.write(`  ${c.red('Not logged in. Run /login first.')}\n`);
       showPrompt();
       return;
     }
+    if (runtimeMode === 'direct' && !anthKey && !openRouterKey) {
+      process.stderr.write(`  ${c.red('Direct mode requires ANTHROPIC_API_KEY or OPENROUTER_API_KEY.')}\n`);
+      showPrompt();
+      return;
+    }
+
+    // Remote/bundled retain the SSE client contract. Local/direct use the
+    // same tool executor and event stream, but move the agent loop into npm.
+    if (runtimeMode === 'local' || runtimeMode === 'direct') {
+      const pluginSchemas = toolExecutor.listPluginToolSchemas?.() || [];
+      const modelSelection = resolveModelSelection({
+        explicitModel: cliArgs.model,
+        modelOverrides: session.modelOverrides,
+        modelMode: session.modelMode,
+        modelRoute: session.routePreference,
+        profileModels: { reasoning: session.model, local: creds.models?.local },
+        modeModels: { fast: creds.models?.fast },
+        fallbackModel: DEFAULT_REASONING_MODEL,
+      });
+      const model = modelSelection.model;
+      const localAgent = new LocalAgent({
+        apiKey: runtimeMode === 'direct' ? anthKey : null,
+        openRouterKey: runtimeMode === 'direct' ? openRouterKey : null,
+        model,
+        toolExecutor,
+        verbose: Boolean(cliArgs.verbose),
+        cwd: safeCwd(),
+        maxTurns: 50,
+        gatewayUrl: runtimeMode === 'local' ? gatewayUrl : null,
+        gatewayToken: runtimeMode === 'local' ? creds.token : null,
+        sessionId: session.id || localSessionId,
+        approvalManager: approval,
+        extraToolSchemas: pluginSchemas,
+      });
+      activeLocalAgent = localAgent;
+      const client = {
+        execute: (instruction, context, history) => localAgent.execute(instruction, context, history),
+        cancel: () => localAgent.cancel(),
+        sendIntervention: (instruction, options) => localAgent.sendIntervention(instruction, options),
+        get currentTaskId() { return null; },
+      };
+      process.stderr.write(`  ${c.dim(`[${runtimeMode}] npm agent loop → ${runtimeMode === 'local' ? 'Bahulam Gateway' : 'provider'}`)}\n`);
+      try {
+        // ── Document and vision preparation continues below ──
+        // The local/direct client uses the same execution call and history.
+        await _executeWithClient(client);
+      } finally {
+        if (activeLocalAgent === localAgent) activeLocalAgent = null;
+      }
+      return;
+    }
 
     // Create or reuse stream client — sessionId persists across turns.
     // The same client also owns the authenticated vision-analysis preflight.
-    if (!streamClient || streamClient.baseUrl !== creds.backendUrl || streamClient.token !== creds.token) {
+    if (!streamClient || streamClient.baseUrl !== creds.backendUrl || streamClient.token !== creds.token || streamClient.mode !== runtimeMode) {
       streamClient = new BahulamStreamClient({
         baseUrl: creds.backendUrl,
         token: creds.token,
         toolExecutor,
         approvalManager: approval,
         pluginRegistry,
+        mode: runtimeMode === 'bundled' ? 'bundled' : 'remote',
       });
     }
     const client = streamClient;
-    if (session.id && !client.sessionId) {
-      client.sessionId = session.id;
-    }
+    if (session.id && !client.sessionId) client.sessionId = session.id;
+
+    await _executeWithClient(client);
+
+    async function _executeWithClient(client) {
 
     try {
       // ── Document attachments (client-side, PRD-091 shape 1) ──
@@ -5703,6 +5800,14 @@ export async function startTerminalRepl() {
           type: 'attachments',
           data: { attachments: prepared.attachments.map(publicAttachmentMetadata) },
         });
+        // Vision analysis is a backend capability on the remote/bundled SSE
+        // client. Local/direct still execute the coding turn locally, but do
+        // not silently send an attachment to the backend for preprocessing.
+        if (typeof client.analyzeVision !== 'function') {
+          input = prepared.instruction || originalInput;
+          pending.length = 0;
+          process.stderr.write(`  ${c.dim('Vision analysis is unavailable in this runtime mode; continuing without image analysis.')}\n`);
+        } else {
         const approved = await confirmVisionUpload(ctx, prepared.attachments, { skip: skipPerms });
         pending.length = 0;
         if (!approved) {
@@ -5726,6 +5831,7 @@ export async function startTerminalRepl() {
           });
           input = appendVisionAnalysisToInstruction(prepared.instruction, analysis);
         }
+        }
       } else {
         input = prepared.instruction || originalInput;
       }
@@ -5831,7 +5937,7 @@ export async function startTerminalRepl() {
         process.stderr.write('\n');
       }
       renderBlockBoundary('user', { compactSame: true });
-      process.stderr.write(`${transcriptHeader('you', { tone: 'user' })} ${paint.text.dim('follow-up')}\n`);
+      process.stderr.write(`${transcriptHeader('you', { tone: 'user' })} ${paint.text.dim('added instruction')}\n`);
       for (const line of String(instruction || '').split('\n')) {
         process.stderr.write(`${transcriptLine(line, { tone: 'user' })}\n`);
       }
@@ -6130,8 +6236,24 @@ export async function startTerminalRepl() {
 
       // Let approval manager pause/resume this listener
       approval.setExecutionHooks({
-        onPause: () => { execListenerActive = false; },
+        onPause: () => {
+          execListenerActive = false;
+          // The tool card/spinner is a transient status surface. Clear it
+          // before ApprovalManager paints its dock overlay, otherwise the
+          // render queue can keep repainting over the approval menu while
+          // the approval key is still being consumed correctly.
+          clearPinnedStatus();
+        },
         onResume: () => { execListenerActive = true; },
+        onApprovalPromptStart: ({ tool, args, tier }) => {
+          clearPinnedStatus();
+          renderBlockBoundary('status', { compactSame: true });
+          const summary = toolDisplaySummary(tool, args || {});
+          const label = toolDisplayLabel(tool);
+          const subject = summary ? `${label} ${summary}` : label;
+          process.stderr.write(`  ${c.yellow('?')} ${c.dim(`approval required · ${subject} · ${tier || 'tool'}`)}\n`);
+          runtime.lastRenderedBlock = 'status';
+        },
         onApprovalPromptEnd: () => {
           if (!isInputDockMounted()) return;
           renderDockInput(executionInputPrefix(), executionInputBuffer, {
@@ -6224,6 +6346,15 @@ export async function startTerminalRepl() {
       }
       if (session.modelMode) execContext.model_mode = session.modelMode;
       if (session.routePreference) execContext.model_route = session.routePreference;
+      const modelSelection = resolveModelSelection({
+        explicitModel: cliArgs.model,
+        modelOverrides: session.modelOverrides,
+        modelMode: session.modelMode,
+        modelRoute: session.routePreference,
+        profileModels: { reasoning: session.model },
+        modeModels: { fast: creds.models?.fast },
+      });
+      Object.assign(execContext, applyModelSelection({}, modelSelection));
       // PRD-071: seed work_scope from CLI so the backend has a byte-stable
       // scope block from turn 1. Uses projectResources already gathered by
       // the envelope above.
@@ -6243,7 +6374,7 @@ export async function startTerminalRepl() {
       // of the local bundled runtime. Session is bootstrapped lazily on
       // first turn and reused across the REPL. Falls through to the
       // existing local-agent path when the flag is unset (default today).
-      const _useGatewayLoop = process.env.BAHULAM_USE_GATEWAY_LOOP === '1';
+      const _useGatewayLoop = runtimeMode === 'remote' && process.env.BAHULAM_USE_GATEWAY_LOOP === '1';
       let _turnIterable;
       if (_useGatewayLoop) {
         if (!session.gatewaySession) {
@@ -6364,6 +6495,8 @@ export async function startTerminalRepl() {
     showPrompt();
   }
 
+  }
+
   rl.on('close', async () => {
     clearSlashHint({ restoreCursor: false });
     inputActive = false;

package/src/tools/registry.mjs

@@ -10,7 +10,6 @@ import { EditTool } from './edit.mjs';
 import { WriteTool } from './write.mjs';
 import { GlobTool } from './glob.mjs';
 import { GrepTool } from './grep.mjs';
-import { AgentTool } from './agent.mjs';
 import { WebFetchTool } from './web-fetch.mjs';
 import { WebSearchTool } from './web-search.mjs';
 import { TodoWriteTool } from './todo-write.mjs';
@@ -48,7 +47,6 @@ const BUILTIN_TOOLS = [
     WriteTool,
     GlobTool,
     GrepTool,
-    AgentTool,
     WebFetchTool,
     WebSearchTool,
     TodoWriteTool,
@@ -90,20 +88,7 @@ export function createToolRegistry({
 } = {}) {
     const tools = new Map();
     for (const Tool of BUILTIN_TOOLS) {
-        if (Tool === AgentTool) {
-            tools.set(Tool.name, {
-                ...Tool,
-                async call(input, options = {}) {
-                    return Tool.call(input, {
-                        ...options,
-                        pluginRegistry: options.pluginRegistry || pluginRegistry,
-                        stateEmit: options.stateEmit || stateEmit,
-                    });
-                },
-            });
-        } else {
-            tools.set(Tool.name, Tool);
-        }
+        tools.set(Tool.name, Tool);
     }
 
     const pluginStateHandles = new Map();