nolo-cli 0.54.0-alpha.2 → 0.61.0-alpha.2

package/{machineCommands-J43U3TX5.js → machineCommands-JXDYQ5LB.js}

@@ -2,90 +2,99 @@ import {
   buildMachinePermissionPromptBlock,
   handleConnectorRunMessage,
   resolveMachineRunPermissionPolicy
-} from "./chunk-7K5VMB4Q.js";
+} from "./chunk-37QVS7BU.js";
 import {
   isConnectorWebSocketAuthError,
   isConnectorWebSocketRetryableError,
   resolveConnectorWebSocketTarget
 } from "./chunk-ALXHV7NK.js";
-import "./chunk-GV35EHNA.js";
-import "./chunk-U5Z7LFZF.js";
+import "./chunk-7O7KH4X5.js";
+import "./chunk-MXUDQZXQ.js";
 import "./chunk-EADNWBAZ.js";
-import "./chunk-NI2BS6UD.js";
-import "./chunk-OYNDYVSE.js";
-import "./chunk-EKLRRZIN.js";
-import "./chunk-JDSUTNYY.js";
-import "./chunk-WHVQA7PJ.js";
+import "./chunk-45YO6H7P.js";
+import "./chunk-DWUCB2A3.js";
+import "./chunk-CTCW7U7N.js";
+import "./chunk-SPAQ4PVV.js";
+import "./chunk-MP64VFGD.js";
 import {
   detectMachineInfo
 } from "./chunk-ESHYE7WU.js";
 import "./chunk-JBTJAPUF.js";
-import "./chunk-4NN3EK7H.js";
+import "./chunk-LAFC3B2I.js";
 import "./chunk-ATNTHIZI.js";
-import "./chunk-UW4INMD2.js";
+import "./chunk-3JWKQDA4.js";
 import "./chunk-HS7MLR74.js";
-import "./chunk-757BGY6Y.js";
-import "./chunk-V4KZGLOI.js";
+import "./chunk-2HPRMEEZ.js";
 import "./chunk-5XTOKQLW.js";
 import "./chunk-NF64D32W.js";
 import {
   CORE_DRAIN_REASON
 } from "./chunk-3L2WKC3W.js";
-import "./chunk-RU5D3B22.js";
+import "./chunk-NTW5GWDM.js";
+import "./chunk-3BLB7QKO.js";
 import "./chunk-KQHGZWSV.js";
-import "./chunk-VRZIH5JO.js";
-import "./chunk-KXKQO4Q6.js";
-import "./chunk-INZZJSQF.js";
-import "./chunk-Y7LNKP32.js";
-import "./chunk-BANYWEYY.js";
-import "./chunk-PAHILFNT.js";
+import "./chunk-2PGGC63K.js";
+import "./chunk-MBOEV4L2.js";
+import "./chunk-OZX2IPKM.js";
+import "./chunk-CP7VIDZ7.js";
+import "./chunk-N4G4PKQ6.js";
+import "./chunk-FZGV4FGK.js";
 import "./chunk-MEYIRKDN.js";
 import "./chunk-63W5N6P3.js";
 import "./chunk-VF4K2QE6.js";
-import "./chunk-6SZ52ORL.js";
-import "./chunk-LA4IDAK7.js";
-import "./chunk-BJLYCOZK.js";
+import "./chunk-7UF7CQ6B.js";
+import "./chunk-ES6CVKVD.js";
+import "./chunk-AVE2YR4F.js";
+import "./chunk-ZJ7UHBJS.js";
+import "./chunk-D5XKNNUV.js";
 import "./chunk-EVBFYPDC.js";
-import "./chunk-H2G6JXTR.js";
+import "./chunk-HQUORJTM.js";
 import "./chunk-YYLHWIW6.js";
-import "./chunk-U2A47SVI.js";
 import "./chunk-AGGIDPCZ.js";
-import "./chunk-32I5RVMY.js";
+import "./chunk-HQP7HJDL.js";
+import "./chunk-4NJEIGBQ.js";
 import "./chunk-5RGU3J7P.js";
+import "./chunk-6YTOJY35.js";
 import "./chunk-M76ECQRD.js";
-import "./chunk-MRWGHF56.js";
-import "./chunk-IA3A5373.js";
+import "./chunk-YDH3FDFQ.js";
+import "./chunk-C3FZR5EC.js";
 import "./chunk-GLKOYSRU.js";
-import "./chunk-AA564GBL.js";
-import "./chunk-O5FLGN2L.js";
+import "./chunk-DZZL7UBV.js";
+import "./chunk-ZRSJ3JEH.js";
 import "./chunk-EY7V7REW.js";
-import "./chunk-6BGAQ3KR.js";
-import "./chunk-INXBNYCG.js";
+import {
+  PATH_FIELD_ALIASES,
+  createLocalWorkspaceToolExecutors
+} from "./chunk-4C4ST2YE.js";
+import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-CVT7L2WZ.js";
-import "./chunk-T27IEBNQ.js";
+import "./chunk-XOKOSO35.js";
+import "./chunk-2QDDKFG5.js";
 import "./chunk-N7J63Q6C.js";
-import "./chunk-YBV6QJKM.js";
-import "./chunk-6BYAXNH5.js";
-import "./chunk-SP3DPVBH.js";
-import "./chunk-TNPCQNGQ.js";
-import "./chunk-IWUMSAQF.js";
+import "./chunk-QEFJJS2I.js";
+import "./chunk-XTJTN3RW.js";
+import "./chunk-QEW2MFDQ.js";
+import "./chunk-RDBARW6T.js";
+import "./chunk-RJ2SAFB5.js";
+import "./chunk-CJCJF5XB.js";
 import "./chunk-2MBTWINN.js";
-import "./chunk-KUUTWU4I.js";
-import "./chunk-H4RYESI6.js";
-import "./chunk-VRJUIUIY.js";
-import "./chunk-NQ4N4IGO.js";
-import "./chunk-FD36SCCD.js";
-import "./chunk-QDHZCAH3.js";
+import "./chunk-5ZYA4JJ3.js";
+import "./chunk-Z4QSJILV.js";
+import "./chunk-LJKICKVC.js";
+import "./chunk-PSCNXBYA.js";
+import "./chunk-BYXBJQAS.js";
+import "./chunk-MMZ6ZTVO.js";
 import "./chunk-DWLEOOGR.js";
-import "./chunk-ZHXJ6M7T.js";
+import "./chunk-3JQ2NRYU.js";
+import "./chunk-ONXOABJR.js";
+import "./chunk-W7XHHYWM.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
-import "./chunk-3AOLVADY.js";
-import "./chunk-7CH6U3FL.js";
+import "./chunk-DVINR3PL.js";
+import "./chunk-2GRGFCF6.js";
 import "./chunk-O6OSWFZQ.js";
-import "./chunk-FA4SY4F5.js";
+import "./chunk-BYEJ7K2Z.js";
 import "./chunk-IDZTNRP2.js";
 import {
   isCompiledBinary
@@ -93,35 +102,37 @@ import {
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
-import "./chunk-56W233KG.js";
-import "./chunk-WL3UOGYO.js";
-import "./chunk-7APQB6R6.js";
-import "./chunk-3QJTD6DO.js";
+import "./chunk-FKFMIBTT.js";
+import "./chunk-22BTGNSP.js";
+import "./chunk-JX5PJCWS.js";
+import "./chunk-VMWYBIXG.js";
 import {
   parsePositiveFiniteNumberOrFallback
 } from "./chunk-Y5GCAMGP.js";
 import "./chunk-UZ6XXCVR.js";
 import "./chunk-KX6YBIHG.js";
-import "./chunk-FGEYVPPR.js";
-import "./chunk-AV6KQCM5.js";
-import "./chunk-SVEUG45B.js";
+import "./chunk-RVWRKFUB.js";
+import "./chunk-UAD2WT54.js";
+import "./chunk-DNNSCSA2.js";
+import "./chunk-NHRQCXIQ.js";
 import "./chunk-WWC7I6TA.js";
 import "./chunk-I42VC5KR.js";
-import "./chunk-MFI4FGHX.js";
+import "./chunk-SOJM57FX.js";
 import "./chunk-QSJ3HFEF.js";
-import "./chunk-VULELK4T.js";
+import "./chunk-L7B47JXR.js";
 import "./chunk-BJIRLHJR.js";
-import "./chunk-PYKV6FSC.js";
+import "./chunk-KWSQR2KK.js";
 import "./chunk-QOKAKDPE.js";
 import "./chunk-OW765XBU.js";
+import "./chunk-SEJ5OS6F.js";
 import "./chunk-GBRG75BQ.js";
-import {
-  isRecord
-} from "./chunk-KUG52IAP.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
 import "./chunk-U6VC4MU4.js";
+import {
+  isRecord
+} from "./chunk-KUG52IAP.js";
 import "./chunk-LCBAMY2M.js";
 import "./chunk-4SN6J65J.js";
 import {
@@ -131,7 +142,7 @@ import "./chunk-G3SUCT4W.js";
 import "./chunk-4VNS5WPM.js";
 
 // packages/connector-experimental/heartbeatLoop.ts
-var defaultSleep = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
+var defaultSleep = (ms) => new Promise((resolve3) => setTimeout(resolve3, ms));
 async function runHeartbeatLoop(options) {
   const sleep = options.sleep ?? defaultSleep;
   let beats = 0;
@@ -348,6 +359,201 @@ async function runMachineWatchCommand(deps) {
   }
 }
 
+// packages/cli/machineToolInvokeDispatch.ts
+import { lstat, realpath } from "node:fs/promises";
+import { dirname as dirname2, isAbsolute as isAbsolute2, relative as relative2, resolve as resolve2, sep } from "node:path";
+var MACHINE_TOOL_INVOKE_V1_TOOL_NAMES = ["readFile", "globFiles"];
+var V1_ALLOWED_TOOL_NAMES = new Set(MACHINE_TOOL_INVOKE_V1_TOOL_NAMES);
+var DEFAULT_TOOL_INVOKE_TIMEOUT_MS = 3e4;
+var TOOL_RESULT_MESSAGE_MAX_CHARS = 1e6;
+var TOOL_NOT_ALLOWED_MESSAGE = "tool not allowed in v1 (read-only)";
+var TOOL_PAYLOAD_MALFORMED_MESSAGE = "malformed tool.invoke payload (payload object required)";
+var TOOL_ARGS_MALFORMED_MESSAGE = "malformed tool.invoke args (args object required)";
+function createMachineToolInvokeHandlers(args) {
+  const executors = (args.createToolExecutors ?? createLocalWorkspaceToolExecutors)({
+    workspaceRoot: args.workspaceRoot,
+    // v1 硬 containment：localWorkspaceTools 在无确认回调时对工作区外路径
+    // 默认放行（交互式 TUI 语义）。机器侧是无人值守的 server 驱动调用，
+    // 一律拒绝外部路径 —— 该回调只对「未走 spill 例外」的工作区外路径触发，
+    // 是纵深防御的第二层；第一层是 dispatch 入口的 machinePathPreflight
+    // （词法 + realpath 双检，spill 路径同样被拒，confirm 不可达）。
+    confirmExternalFileAccess: async () => false,
+    // 机器协议 v1（M3 修复）：TUI 的 readFile 去重 ledger 面向「同一会话的
+    // 重复读提示」，daemon 长生命周期会让它跨越多个 server 会话 —— 新会话
+    // 重读同一文件会拿到去重文案而非内容。readFileNoLedger 关闭去重 ledger，
+    // 机器侧 readFile 每次都返回真实内容，语义等价于 TUI 的 force:true。
+    readFileNoLedger: true
+  });
+  const executorMap = executors;
+  const invokeWithTimeout = async (toolName, executorArgs, timeoutMs, workspaceRoot) => {
+    const call = {
+      id: "machine-tool-invoke",
+      name: toolName,
+      arguments: typeof executorArgs === "string" ? executorArgs : JSON.stringify(executorArgs ?? {})
+    };
+    const requestPath = extractMachineToolRequestPath(executorArgs);
+    if (requestPath !== null) {
+      const preflightError = await machinePathPreflight({
+        workspaceRoot,
+        request: requestPath
+      });
+      if (preflightError) return { error: preflightError };
+    }
+    let timer = null;
+    try {
+      const outcome = await Promise.race([
+        executorMap[toolName](call),
+        new Promise((_, reject) => {
+          timer = setTimeout(() => reject(new Error(`tool.invoke timed out after ${timeoutMs}ms`)), timeoutMs);
+        })
+      ]);
+      const content = typeof outcome?.content === "string" ? outcome.content : "";
+      if (content.length > TOOL_RESULT_MESSAGE_MAX_CHARS) {
+        return {
+          result: content.slice(0, TOOL_RESULT_MESSAGE_MAX_CHARS) + `
+
+[... output truncated at ${TOOL_RESULT_MESSAGE_MAX_CHARS} chars ...]`
+        };
+      }
+      return { result: content };
+    } catch (error) {
+      return { error: toMessage(error) };
+    } finally {
+      if (timer) clearTimeout(timer);
+    }
+  };
+  const invokeMachineTool = async (requestId, toolName, toolArgs, timeoutMs) => {
+    if (!V1_ALLOWED_TOOL_NAMES.has(toolName)) {
+      return { error: TOOL_NOT_ALLOWED_MESSAGE };
+    }
+    const resolvedTimeout = resolveTimeoutMs(timeoutMs);
+    return invokeWithTimeout(toolName, toolArgs, resolvedTimeout, args.workspaceRoot);
+  };
+  return {
+    handleToolInvokeMessage: async (message, send) => {
+      const frame = parseToolInvokeFrame(message);
+      if (!frame) return null;
+      const { requestId, payload } = frame;
+      if (frame.payloadMalformed) {
+        send(
+          JSON.stringify({ type: "tool.result", requestId, error: TOOL_PAYLOAD_MALFORMED_MESSAGE })
+        );
+        return JSON.stringify({ type: "tool.result", requestId, error: TOOL_PAYLOAD_MALFORMED_MESSAGE });
+      }
+      if (!isRecord2(payload.args)) {
+        send(
+          JSON.stringify({ type: "tool.result", requestId, error: TOOL_ARGS_MALFORMED_MESSAGE })
+        );
+        return JSON.stringify({ type: "tool.result", requestId, error: TOOL_ARGS_MALFORMED_MESSAGE });
+      }
+      const outcome = await invokeMachineTool(
+        requestId,
+        payload.tool,
+        payload.args,
+        payload.timeoutMs
+      );
+      send(
+        JSON.stringify(
+          outcome.error !== void 0 ? { type: "tool.result", requestId, error: outcome.error } : { type: "tool.result", requestId, result: outcome.result ?? "" }
+        )
+      );
+      return JSON.stringify(
+        outcome.error !== void 0 ? { type: "tool.result", requestId, error: outcome.error } : { type: "tool.result", requestId, result: outcome.result ?? "" }
+      );
+    },
+    invokeMachineTool
+  };
+}
+function resolveTimeoutMs(value) {
+  const parsed = Number(value);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_TOOL_INVOKE_TIMEOUT_MS;
+}
+function toMessage(error) {
+  if (error instanceof Error && error.message) return error.message;
+  if (typeof error === "string" && error) return error;
+  return "tool.invoke failed";
+}
+function isLexicallyInsideRoot(root, targetPath) {
+  const rel = relative2(resolve2(root), resolve2(targetPath));
+  return rel === "" || rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute2(rel);
+}
+async function machinePathPreflight(args) {
+  const workspaceRoot = resolve2(args.workspaceRoot);
+  const lexicalPath = resolve2(workspaceRoot, args.request);
+  if (!isLexicallyInsideRoot(workspaceRoot, lexicalPath)) {
+    return `path outside workspace root: ${args.request}`;
+  }
+  let current = lexicalPath;
+  const symlinks = [];
+  while (true) {
+    const stats = await lstat(current).catch(() => void 0);
+    if (!stats) {
+      return null;
+    }
+    if (!stats.isSymbolicLink()) break;
+    const target = await realpath(current).catch(() => void 0);
+    if (!target) return null;
+    symlinks.push({ link: current, target });
+    current = resolve2(current, "..");
+    if (current === dirname2(current)) break;
+  }
+  try {
+    const [realRequest, realRoot] = await Promise.all([realpath(lexicalPath), realpath(workspaceRoot)]);
+    if (!isLexicallyInsideRoot(realRoot, realRequest)) {
+      return `path outside workspace root after symlink resolution: ${args.request}`;
+    }
+  } catch (error) {
+    if (symlinks.length === 0) return null;
+    return `path outside workspace root after symlink resolution: ${args.request}`;
+  }
+  return null;
+}
+function extractMachineToolRequestPath(executorArgs) {
+  const rawArgs = typeof executorArgs === "string" ? executorArgs : executorArgs !== void 0 && executorArgs !== null ? JSON.stringify(executorArgs) : null;
+  if (rawArgs === null) return null;
+  let parsed;
+  try {
+    parsed = JSON.parse(rawArgs);
+  } catch {
+    return null;
+  }
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return null;
+  for (const key of PATH_FIELD_ALIASES) {
+    const value = parsed[key];
+    if (typeof value === "string" && value.length > 0) return value.trim();
+  }
+  return null;
+}
+function parseToolInvokeFrame(message) {
+  let parsed;
+  try {
+    parsed = JSON.parse(message);
+  } catch {
+    return null;
+  }
+  if (!isRecord2(parsed) || parsed.type !== "tool.invoke") return null;
+  if (typeof parsed.requestId !== "string" || parsed.requestId.length === 0) return null;
+  if (!isRecord2(parsed.payload)) {
+    return {
+      requestId: parsed.requestId,
+      payload: { tool: "", args: {}, timeoutMs: void 0 },
+      payloadMalformed: true
+    };
+  }
+  const payload = parsed.payload;
+  return {
+    requestId: parsed.requestId,
+    payload: {
+      tool: typeof payload.tool === "string" ? payload.tool : "",
+      args: payload.args,
+      timeoutMs: payload.timeoutMs
+    }
+  };
+}
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
 // packages/cli/machineWsSession.ts
 var CONNECTOR_WS_KEEPALIVE_MS = 25e3;
 function buildConnectorKeepaliveMessage() {
@@ -364,7 +570,7 @@ async function defaultConnectWebSocket(url, options) {
   if (!WebSocketCtor) {
     throw new Error("WebSocket is not available in this runtime");
   }
-  await new Promise((resolve2, reject) => {
+  await new Promise((resolve3, reject) => {
     const ws = new WebSocketCtor(url, {
       headers: options.headers
     });
@@ -383,7 +589,7 @@ async function defaultConnectWebSocket(url, options) {
       try {
         ws.close();
       } catch {
-        resolve2();
+        resolve3();
       }
     };
     options.signal?.addEventListener("abort", handleAbort, { once: true });
@@ -404,7 +610,7 @@ async function defaultConnectWebSocket(url, options) {
     ws.addEventListener("error", () => {
       clearKeepalive();
       if (aborted) {
-        resolve2();
+        resolve3();
         return;
       }
       reject(new Error("connector websocket failed"));
@@ -413,7 +619,7 @@ async function defaultConnectWebSocket(url, options) {
       "close",
       () => {
         clearKeepalive();
-        if (opened || aborted) resolve2();
+        if (opened || aborted) resolve3();
         else reject(new Error("connector websocket closed before opening"));
       },
       { once: true }
@@ -466,12 +672,12 @@ async function runMachineWsSession(options) {
         sentMessages.push(response);
       })
     });
-    const abortPromise = options.signal ? new Promise((resolve2) => {
+    const abortPromise = options.signal ? new Promise((resolve3) => {
       if (options.signal?.aborted) {
-        resolve2("aborted");
+        resolve3("aborted");
         return;
       }
-      options.signal?.addEventListener("abort", () => resolve2("aborted"), { once: true });
+      options.signal?.addEventListener("abort", () => resolve3("aborted"), { once: true });
     }) : null;
     const raceResult = await Promise.race(
       [websocketPromise, heartbeatMonitorPromise, abortPromise].filter(Boolean)
@@ -581,6 +787,14 @@ ${text}
 }
 
 // packages/cli/machineCommands.ts
+async function handleMachineWsMessageDemux(message, send, handlers, runConnectorMessage) {
+  try {
+    const toolResult = await handlers.toolInvoke.handleToolInvokeMessage(message, send);
+    if (toolResult !== null) return;
+  } catch {
+  }
+  await runConnectorMessage();
+}
 function resolveAuthToken2(env) {
   return env.AUTH_TOKEN || env.AUTH || "";
 }
@@ -614,7 +828,7 @@ function resolveConnectServerUrl(args, env) {
 function resolveConnectAuthToken(args, env) {
   return readOption(args, "--machine-key") || readOption(args, "--token") || resolveAuthToken2(env);
 }
-var defaultSleep2 = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
+var defaultSleep2 = (ms) => new Promise((resolve3) => setTimeout(resolve3, ms));
 async function sleepWithAbort(ms, sleep, signal) {
   if (!signal) {
     await sleep(ms);
@@ -623,8 +837,8 @@ async function sleepWithAbort(ms, sleep, signal) {
   if (signal.aborted) return;
   await Promise.race([
     sleep(ms),
-    new Promise((resolve2) => {
-      signal.addEventListener("abort", () => resolve2(), { once: true });
+    new Promise((resolve3) => {
+      signal.addEventListener("abort", () => resolve3(), { once: true });
     })
   ]);
 }
@@ -633,7 +847,7 @@ function resolveConnectorReconnectDelayMs(env) {
   return Number.isFinite(raw) && raw >= 0 ? raw : 5e3;
 }
 async function defaultExecuteCli(provider, prompt, options) {
-  const { executeCli } = await import("./cliExecutor-BBUVQU4L.js");
+  const { executeCli } = await import("./cliExecutor-HG3S345O.js");
   return executeCli(provider, prompt, options);
 }
 function detectLaunchableMachineInfo() {
@@ -726,6 +940,9 @@ ${text}`);
     const maxAttempts = deps.maxConnectorAttempts ?? Infinity;
     const sleep = deps.sleep ?? defaultSleep2;
     const reconnectDelayMs = resolveConnectorReconnectDelayMs(env);
+    const toolInvokeHandlers = createMachineToolInvokeHandlers({
+      workspaceRoot: process.cwd()
+    });
     for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
       if (deps.signal?.aborted) {
         return 0;
@@ -745,22 +962,27 @@ ${text}`);
           ...options,
           fetchImpl
         }),
-        onMessage: (message, send) => handleConnectorRunMessage(
+        onMessage: (message, send) => handleMachineWsMessageDemux(
           message,
           send,
-          deps.executeCli ?? defaultExecuteCli,
-          {
-            ...env,
-            NOLO_SERVER: runtimeServerUrl,
-            NOLO_SERVER_URL: runtimeServerUrl,
-            BASE_URL: runtimeServerUrl,
-            AUTH_TOKEN: authToken,
-            NOLO_MACHINE_API_KEY: authToken
-          },
-          fetchImpl,
-          {
-            buildConnectorCliPrompt
-          }
+          { toolInvoke: toolInvokeHandlers },
+          () => handleConnectorRunMessage(
+            message,
+            send,
+            deps.executeCli ?? defaultExecuteCli,
+            {
+              ...env,
+              NOLO_SERVER: runtimeServerUrl,
+              NOLO_SERVER_URL: runtimeServerUrl,
+              BASE_URL: runtimeServerUrl,
+              AUTH_TOKEN: authToken,
+              NOLO_MACHINE_API_KEY: authToken
+            },
+            fetchImpl,
+            {
+              buildConnectorCliPrompt
+            }
+          )
         )
       });
       const exitCode = sessionResult.exitCode;