chainlesschain 0.162.175 → 0.162.177

package/src/repl/agent-repl.js

@@ -183,12 +183,12 @@ function persistRecentDenial(record, options = {}) {
  * user's attention (e.g. waiting on a permission/risk confirmation). A hook can
  * ring a bell / send a desktop notification. Best-effort, never blocks.
  */
-async function _fireNotification(message, type = "info") {
+async function _fireNotification(message, type = "info", session = null) {
   // Fire settings.json observe hooks first (best-effort)
   if (_settingsHooks) {
     try {
       const { runObserveHooks } =
-        await import("../lib/settings-hook-events.cjs");
+        await import("../lib/settings-hook-events.js");
       runObserveHooks(
         _settingsHooks,
         "Notification",
@@ -196,7 +196,7 @@ async function _fireNotification(message, type = "info") {
           message,
           type,
           cwd: process.cwd(),
-          session_id: _session?.sessionId || null,
+          session_id: session?.sessionId || null,
         },
         { cwd: process.cwd() },
       );
@@ -205,10 +205,10 @@ async function _fireNotification(message, type = "info") {
     }
   }
   // Fire database-registered Notification hooks (interceptable/suppressible)
-  if (_session) {
+  if (session) {
     try {
       const result = await fireNotification(_hookDb, message, {
-        session: _session,
+        session,
         type,
       });
       if (result?.directive?.suppress) {
@@ -750,6 +750,8 @@ export async function startAgentRepl(options = {}) {
         }
         await _fireNotification(
           `Permission needed: ${riskLevel || "medium"}-risk ${tool || "run_shell"}${args?.command ? " — " + args.command : ""}`,
+          "info",
+          _sessionHandle,
         );
         const local = askGateApprovalLocally({ tool, args, riskLevel });
         if (!_remoteApproval?.bridge) return local.promise;
@@ -840,6 +842,8 @@ export async function startAgentRepl(options = {}) {
       }
       await _fireNotification(
         `Permission needed: ${tool}${rule ? " (" + rule + ")" : ""}`,
+        "info",
+        _sessionHandle,
       );
       const local = askPermissionLocally({ tool, args, rule, reason });
       if (!_remoteApproval?.bridge) return local.promise;
@@ -1142,7 +1146,7 @@ export async function startAgentRepl(options = {}) {
   if (_settingsHooks && _loadedReplInstructions) {
     try {
       const { runInstructionsLoadedHooks } =
-        await import("../lib/settings-hook-events.cjs");
+        await import("../lib/settings-hook-events.js");
       const ctx = runInstructionsLoadedHooks(_settingsHooks, {
         files: _loadedReplInstructions.files,
         cwd: process.cwd(),
@@ -1158,7 +1162,7 @@ export async function startAgentRepl(options = {}) {
   if (_settingsHooks) {
     try {
       const { runSessionStartHooks } =
-        await import("../lib/settings-hook-events.cjs");
+        await import("../lib/settings-hook-events.js");
       const ctx = runSessionStartHooks(_settingsHooks, {
         source: "startup",
         cwd: process.cwd(),
@@ -1466,7 +1470,7 @@ export async function startAgentRepl(options = {}) {
     if (_settingsHooks && messages.some((m) => m.role !== "system")) {
       try {
         const { runObserveHooks } =
-          await import("../lib/settings-hook-events.cjs");
+          await import("../lib/settings-hook-events.js");
         runObserveHooks(
           _settingsHooks,
           "SessionResume",
@@ -1762,6 +1766,41 @@ export async function startAgentRepl(options = {}) {
   // "close" cleanup instead of a bare exit.
   _replRl = rl;
 
+  // MCP elicitation in the interactive REPL uses the same readline surface as
+  // approvals, while MCPClient retains the protocol-level response shape.
+  const mcpElicitationClients = [_adhocMcp?.mcpClient, _bundleMcpClient].filter(
+    (client) => client?.setElicitationHandler,
+  );
+  for (const client of mcpElicitationClients) {
+    client.setElicitationHandler(
+      (request) =>
+        new Promise((resolve) => {
+          const label =
+            request.message || "MCP server requests additional input";
+          rl.question(
+            chalk.yellow(`\n  MCP [${request.server}] ${label}\n  > `),
+            (answer) => {
+              const trimmed = String(answer || "").trim();
+              if (!trimmed) {
+                resolve({ action: "cancel" });
+              } else {
+                let content = { value: trimmed };
+                try {
+                  const parsed = JSON.parse(trimmed);
+                  if (parsed && typeof parsed === "object") content = parsed;
+                } catch {
+                  // Plain text remains a valid single-field elicitation answer.
+                }
+                resolve({ action: "accept", content });
+              }
+              rl.prompt();
+            },
+          );
+        }),
+      { timeoutMs: options.mcpElicitationTimeoutMs },
+    );
+  }
+
   // Inbound channels (--channels, gap-2026-07-11 P0#5): external events enter
   // this session as user turns. rl.emit("line") reuses the REPL's own input
   // path, so an event landing mid-turn queues behind it (pending-lines), and
@@ -1864,7 +1903,7 @@ export async function startAgentRepl(options = {}) {
         // turn — the session stays open, the current work is suspended. The
         // keypress handler can't await, so fire observe-only fire-and-forget.
         if (_settingsHooks) {
-          import("../lib/settings-hook-events.cjs")
+          import("../lib/settings-hook-events.js")
             .then(({ runObserveHooks }) =>
               runObserveHooks(
                 _settingsHooks,
@@ -2026,7 +2065,7 @@ export async function startAgentRepl(options = {}) {
   const _costStore = newCostStore(); // running token spend for `/cost`
   let _renderStatus = null;
   try {
-    const slm = await import("../lib/status-line.cjs");
+    const slm = await import("../lib/status-line.js");
     const _sl = slm.default || slm;
     const _slCfg = _sl.loadStatusLineConfig({ cwd: process.cwd() });
     _customStatus = !!_slCfg;
@@ -3121,12 +3160,12 @@ export async function startAgentRepl(options = {}) {
           if (_settingsHooks && oldCwd !== newCwd) {
             try {
               const { runCwdChangedHooks, dispatchAsyncHooks } =
-                await import("../lib/settings-hook-events.cjs");
+                await import("../lib/settings-hook-events.js");
               const payload = { oldCwd, newCwd, sessionId };
               runCwdChangedHooks(_settingsHooks, payload);
               if (!_asyncHookSupervisor) {
                 const { AsyncHookSupervisor } =
-                  await import("../lib/async-hook-supervisor.cjs");
+                  await import("../lib/async-hook-supervisor.js");
                 _asyncHookSupervisor = new AsyncHookSupervisor({
                   persistStats: true,
                 });
@@ -3707,7 +3746,7 @@ export async function startAgentRepl(options = {}) {
         if (_settingsHooks) {
           try {
             const { runObserveHooks, dispatchAsyncHooks } =
-              await import("../lib/settings-hook-events.cjs");
+              await import("../lib/settings-hook-events.js");
             const payload = {
               session_id: sessionId || null,
               source: "reload-plugins",
@@ -3715,7 +3754,7 @@ export async function startAgentRepl(options = {}) {
             runObserveHooks(_settingsHooks, "ConfigChange", payload, { cwd });
             if (!_asyncHookSupervisor) {
               const { AsyncHookSupervisor } =
-                await import("../lib/async-hook-supervisor.cjs");
+                await import("../lib/async-hook-supervisor.js");
               _asyncHookSupervisor = new AsyncHookSupervisor({
                 persistStats: true,
               });
@@ -5067,7 +5106,7 @@ export async function startAgentRepl(options = {}) {
     if (_settingsHooks) {
       try {
         const { runUserPromptSubmitHooks } =
-          await import("../lib/settings-hook-events.cjs");
+          await import("../lib/settings-hook-events.js");
         const ups = runUserPromptSubmitHooks(_settingsHooks, {
           prompt: userContent,
           cwd: process.cwd(),
@@ -5090,10 +5129,10 @@ export async function startAgentRepl(options = {}) {
         // turn without blocking it; its result/rewake surfaces on a later turn
         // via the async-hook drain below. Lazily create the supervisor.
         const { dispatchAsyncHooks } =
-          await import("../lib/settings-hook-events.cjs");
+          await import("../lib/settings-hook-events.js");
         if (!_asyncHookSupervisor) {
           const { AsyncHookSupervisor } =
-            await import("../lib/async-hook-supervisor.cjs");
+            await import("../lib/async-hook-supervisor.js");
           _asyncHookSupervisor = new AsyncHookSupervisor({
             persistStats: true,
           });
@@ -5401,7 +5440,7 @@ export async function startAgentRepl(options = {}) {
       // fire-and-forget; their results/rewakes drain into the next turn above.
       if (_settingsHooks && !_asyncHookSupervisor) {
         const { AsyncHookSupervisor } =
-          await import("../lib/async-hook-supervisor.cjs");
+          await import("../lib/async-hook-supervisor.js");
         _asyncHookSupervisor = new AsyncHookSupervisor({ persistStats: true });
       }
       const {
@@ -5547,7 +5586,6 @@ export async function startAgentRepl(options = {}) {
         try {
           const rg = await import("../lib/repl-goal.js");
           const fsMod = await import("node:fs");
-          const cpMod = await import("node:child_process");
           const judge = async (cond, { finalText }) => {
             const { chatWithTools } = await import("../runtime/agent-core.js");
             const { firstBalancedJson } =
@@ -5589,7 +5627,6 @@ export async function startAgentRepl(options = {}) {
             response || "",
             {
               cwd: process.cwd(),
-              spawnSync: cpMod.spawnSync,
               existsSync: fsMod.existsSync,
               judge,
             },
@@ -5740,7 +5777,7 @@ export async function startAgentRepl(options = {}) {
       if (_settingsHooks) {
         try {
           const { runObserveHooks, dispatchAsyncHooks } =
-            await import("../lib/settings-hook-events.cjs");
+            await import("../lib/settings-hook-events.js");
           runObserveHooks(
             _settingsHooks,
             "Stop",
@@ -5749,7 +5786,7 @@ export async function startAgentRepl(options = {}) {
           );
           if (!_asyncHookSupervisor) {
             const { AsyncHookSupervisor } =
-              await import("../lib/async-hook-supervisor.cjs");
+              await import("../lib/async-hook-supervisor.js");
             _asyncHookSupervisor = new AsyncHookSupervisor({
               persistStats: true,
             });
@@ -5847,7 +5884,7 @@ export async function startAgentRepl(options = {}) {
     if (_settingsHooks) {
       try {
         const { runObserveHooks } =
-          await import("../lib/settings-hook-events.cjs");
+          await import("../lib/settings-hook-events.js");
         runObserveHooks(
           _settingsHooks,
           "SessionEnd",

package/src/repl/clipboard-copy.js

@@ -4,7 +4,7 @@
  * spawn wrapper. The pure parts are unit-tested; real clipboard I/O is
  * environment-dependent and exercised through an injected spawnSync.
  */
-import { spawnSync as _spawnSync } from "node:child_process";
+import { executionBroker } from "../lib/process-execution-broker/index.js";
 
 /** Flatten a message's content (string | content-parts[]) to plain text. Pure. */
 export function messageText(content) {
@@ -78,7 +78,9 @@ export function clipboardCommands(platform = process.platform) {
   ];
 }
 
-const _deps = { spawnSync: _spawnSync };
+const _deps = {
+  spawnSync: (...args) => executionBroker.spawnSync(...args),
+};
 
 /**
  * Write text to the system clipboard, trying each platform candidate in order
@@ -96,6 +98,10 @@ export function copyToClipboard(text, { platform, spawnSync } = {}) {
         input: text,
         encoding: "utf-8",
         windowsHide: true,
+        origin: "repl:clipboard-copy",
+        policy: "allow",
+        scope: "clipboard",
+        shell: false,
       });
     } catch (e) {
       lastErr = e.message;

package/src/repl/pr-comments.js

@@ -9,15 +9,26 @@
  * or a real repo. The REPL (agent-repl.js) wires expandPrComments into the
  * same promptText seam that `/mcp__server__prompt` uses.
  */
-import { execFile } from "child_process";
+import { executionBroker } from "../lib/process-execution-broker/index.js";
+
+export const _deps = {
+  execFile: (...args) => executionBroker.execFile(...args),
+};
 
 /** Default `gh` runner — resolves stdout, rejects with a friendly message. */
-function defaultRunGh(args) {
+function defaultRunGh(args, deps = _deps) {
   return new Promise((resolve, reject) => {
-    execFile(
+    deps.execFile(
       "gh",
       args,
-      { encoding: "utf-8", maxBuffer: 16 * 1024 * 1024 },
+      {
+        encoding: "utf-8",
+        maxBuffer: 16 * 1024 * 1024,
+        origin: "repl:pr-comments",
+        policy: "allow",
+        scope: "pr",
+        shell: false,
+      },
       (err, stdout, stderr) => {
         if (err) {
           if (err.code === "ENOENT") {
@@ -125,7 +136,9 @@ export function formatPrComments(data) {
  * @param {object} opts  { pr?: number, repo?: string, deps?: { runGh } }
  */
 export async function fetchPrComments({ pr = null, repo = null, deps } = {}) {
-  const runGh = deps?.runGh || defaultRunGh;
+  const runtimeDeps = { ..._deps, ...(deps || {}) };
+  const runGh =
+    runtimeDeps.runGh || ((args) => defaultRunGh(args, runtimeDeps));
   const viewArgs = ["pr", "view"];
   if (pr) viewArgs.push(String(pr));
   if (repo) viewArgs.push("--repo", repo);
@@ -175,7 +188,12 @@ const PR_INSTRUCTION =
  * Throws on fetch failure (the REPL surfaces it and skips the turn).
  */
 export async function expandPrComments(line, { deps } = {}) {
-  if (!String(line || "").trim().startsWith("/pr-comments")) return null;
+  if (
+    !String(line || "")
+      .trim()
+      .startsWith("/pr-comments")
+  )
+    return null;
   const { pr, repo } = parsePrCommentsArg(line);
   const data = await fetchPrComments({ pr, repo, deps });
   const block = formatPrComments(data);
@@ -183,5 +201,10 @@ export async function expandPrComments(line, { deps } = {}) {
     (data.reviews?.length || 0) +
     (data.conversation?.length || 0) +
     (data.inline?.length || 0);
-  return { number: data.number, count, block, text: `${PR_INSTRUCTION}\n\n${block}` };
+  return {
+    number: data.number,
+    count,
+    block,
+    text: `${PR_INSTRUCTION}\n\n${block}`,
+  };
 }