nolo-cli 0.1.38 → 0.1.39

package/cli/machineWsRunDispatch.ts

@@ -10,7 +10,6 @@ import {
   resolveConnectorRunCwd as defaultResolveConnectorRunCwd,
 } from "./connectorRunArtifact";
 import { createCliLocalRuntimeAdapter } from "./client/localRuntimeAdapter";
-import { prepareTaskWorktree } from "./client/taskWorktree";
 import {
   materializeLargeConnectorPrompt as defaultMaterializeLargeConnectorPrompt,
   readRuntimePromptPageMeta as defaultReadRuntimePromptPageMeta,
@@ -65,7 +64,6 @@ type MachineWsRunDispatchDeps = {
   collectConnectorRunArtifact?: typeof defaultCollectConnectorRunArtifact;
   materializeLargeConnectorPrompt?: typeof defaultMaterializeLargeConnectorPrompt;
   readRuntimePromptPageMeta?: typeof defaultReadRuntimePromptPageMeta;
-  prepareTaskWorktree?: typeof prepareTaskWorktree;
   buildConnectorCliPrompt?: (
     agentConfig: any,
     userInput: string,
@@ -97,6 +95,18 @@ function logConnectorRun(message: string, fields: Record<string, unknown> = {})
   console.error(`[nolo-connector] ${message} ${JSON.stringify(fields)}`);
 }
 
+function summarizeRuntimePolicyForLogs(policy?: ConnectorRuntimePolicy) {
+  return {
+    hasPolicy: Boolean(policy),
+    runtimeTools: policy?.runtimeTools ?? [],
+    agentTools: policy?.agentTools ?? [],
+    workspaceMode: policy?.workspace?.mode ?? null,
+    workspaceCwd: policy?.workspace?.cwd ?? null,
+    shellEnabled: policy?.shell?.enabled ?? null,
+    shellMode: policy?.shell?.mode ?? null,
+  };
+}
+
 function summarizeEndpoint(value: unknown) {
   if (typeof value !== "string" || !value.trim()) return undefined;
   try {
@@ -139,14 +149,9 @@ function runtimePolicyFromConnectorPayload(parsed: any): ConnectorRuntimePolicy
   return policy ? policy as ConnectorRuntimePolicy : undefined;
 }
 
-function requestsTaskWorktree(policy?: ConnectorRuntimePolicy) {
-  return policy?.workspace?.mode === "task-worktree" || policy?.workspace?.mode === "lease";
-}
-
 function requestsLocalWorkspaceRuntime(policy?: ConnectorRuntimePolicy) {
   return Boolean(
-    Array.isArray(policy?.runtimeTools) && policy.runtimeTools.length > 0 ||
-      requestsTaskWorktree(policy),
+    Array.isArray(policy?.runtimeTools) && policy.runtimeTools.length > 0,
   );
 }
 
@@ -183,13 +188,13 @@ function runtimeWorkspacePermissionPolicy(
   runtimeEnv: EnvLike,
   cwd: string
 ): PermissionPolicy | null {
-  if (!requestsTaskWorktree(runtimePolicy)) return null;
+  if (!requestsLocalWorkspaceRuntime(runtimePolicy)) return null;
   return {
     mode: "full_access",
     allowFilesystemRead: true,
     allowFilesystemWrite: true,
     allowShell:
-      ["worktree", "dangerous", "1", "true"].includes(runtimeEnv.NOLO_LOCAL_SHELL_MODE || "") &&
+      runtimeEnv.NOLO_LOCAL_SHELL_MODE === "worktree" &&
       Array.isArray(runtimePolicy?.runtimeTools) &&
       runtimePolicy.runtimeTools.includes("execShell"),
     writableRoots: [cwd],
@@ -201,7 +206,7 @@ function scopePermissionPolicyToRuntimeWorkspace(
   runtimePolicy: ConnectorRuntimePolicy | undefined,
   cwd: string
 ): PermissionPolicy {
-  if (!requestsTaskWorktree(runtimePolicy)) return policy;
+  if (!requestsLocalWorkspaceRuntime(runtimePolicy)) return policy;
   return {
     ...policy,
     writableRoots: policy.allowFilesystemWrite ? [cwd] : [],
@@ -313,7 +318,6 @@ async function defaultRunConnectorLocalRuntimeAgent(args: {
       policy?.runtimeTools,
     ),
     ...(policy ? { runtimeToolPolicy: policy } : {}),
-    ...(requestsTaskWorktree(policy) ? { localWorkspaceMode: "task-worktree" } : {}),
   };
   const store = new Map<string, any>([
     [agentKey, agentRecord],
@@ -324,19 +328,17 @@ async function defaultRunConnectorLocalRuntimeAgent(args: {
     withForwardedUserAuthToken(args.runtimeEnv, args.parsed),
     policy
   );
-  const wantsTaskWorktree = requestsTaskWorktree(policy);
+  logConnectorRun("agent.run.local-runtime.env", {
+    requestId: args.parsed.requestId,
+    agentKey,
+    cwd: args.cwd,
+    runtimeEnvShellModeBeforePolicy: args.runtimeEnv.NOLO_LOCAL_SHELL_MODE ?? null,
+    runtimeEnvShellModeAfterPolicy: env.NOLO_LOCAL_SHELL_MODE ?? null,
+    ...summarizeRuntimePolicyForLogs(policy),
+  });
   const adapter = createCliLocalRuntimeAdapter({
     env,
     cwd: args.cwd,
-    useCwdAsTaskWorkspaceBase: wantsTaskWorktree,
-    ...(wantsTaskWorktree
-      ? {
-          prepareTaskWorktree: (input) => prepareTaskWorktree({
-            ...input,
-            cwd: args.cwd,
-          }),
-        }
-      : {}),
     fetchImpl: args.fetchImpl ?? fetch,
     store: {
       read: async (key) => store.get(key) ?? null,
@@ -447,7 +449,6 @@ export async function handleConnectorRunMessage(
     deps.materializeLargeConnectorPrompt ?? defaultMaterializeLargeConnectorPrompt;
   const readRuntimePromptPageMeta =
     deps.readRuntimePromptPageMeta ?? defaultReadRuntimePromptPageMeta;
-  const prepareTaskWorktreeImpl = deps.prepareTaskWorktree ?? prepareTaskWorktree;
   const runConnectorLocalRuntimeAgent =
     deps.runConnectorLocalRuntimeAgent ?? defaultRunConnectorLocalRuntimeAgent;
   try {
@@ -465,15 +466,6 @@ export async function handleConnectorRunMessage(
       if (!buildConnectorCliPrompt) {
         throw new Error("buildConnectorCliPrompt is required for CLI connector runs.");
       }
-      if (requestsTaskWorktree(runtimePolicy)) {
-        const prepared = await prepareTaskWorktreeImpl({
-          agentKey: String(parsed.payload?.agentKey ?? "agent"),
-          cwd,
-          env: runtimeEnv,
-        });
-        cwd = prepared.path;
-        artifactCwd = prepared.path;
-      }
       const runtimePermissionPolicy = !hasExplicitMachinePermissions(agentConfig)
         ? runtimeWorkspacePermissionPolicy(runtimePolicy, runtimeEnv, cwd)
         : null;
@@ -507,7 +499,7 @@ export async function handleConnectorRunMessage(
         ...(runtimePromptPage?.dbKey ? { promptPageKey: runtimePromptPage.dbKey } : {}),
         ...(runtimePromptPage?.promptHash ? { promptPageHash: runtimePromptPage.promptHash } : {}),
         workspaceRoot: artifactCwd,
-        workspaceKind: requestsTaskWorktree(runtimePolicy) ? "task-worktree" : "current",
+        workspaceKind: "current",
       };
       logConnectorRun("agent.run.cli.start", {
         requestId: parsed.requestId,
@@ -580,9 +572,9 @@ export async function handleConnectorRunMessage(
         artifacts,
         runtimePolicy,
         workspaceRoot: artifactCwd,
-        workspaceKind: requestsTaskWorktree(runtimePolicy) ? "task-worktree" : "current",
+        workspaceKind: "current",
       });
-      if (artifactProgress && requestsTaskWorktree(runtimePolicy)) sendProgress(artifactProgress);
+      if (artifactProgress) sendProgress(artifactProgress);
       send(JSON.stringify({
         type: "agent.run.result",
         requestId: parsed.requestId,
@@ -628,9 +620,9 @@ export async function handleConnectorRunMessage(
       artifacts,
       runtimePolicy,
       workspaceRoot: artifactCwd,
-      workspaceKind: requestsTaskWorktree(runtimePolicy) ? "task-worktree" : "current",
+      workspaceKind: "current",
     });
-    if (artifactProgress && requestsTaskWorktree(runtimePolicy)) sendProgress(artifactProgress);
+    if (artifactProgress) sendProgress(artifactProgress);
     send(JSON.stringify({
       type: "agent.run.result",
       requestId: parsed.requestId,

package/cli/scriptCommandEntries.ts

@@ -16,8 +16,6 @@ function getDocScriptCommands(): CommandEntry[] {
 
 function getSpaceScriptCommands(): CommandEntry[] {
   return [
-    createScriptCommand(["dialog", "read"], "readDialog.ts", "Read a dialog"),
-    createScriptCommand(["dialog", "status"], "dialogStatus.ts", "Read compact dialog status"),
     createScriptCommand(["space", "list"], "listSpaces.ts", "List joined spaces"),
     createScriptCommand(["space", "read"], "readSpace.ts", "Read a space"),
     createScriptCommand(["space", "delete"], "deleteSpaces.ts", "Delete spaces by safe filters"),

package/cli/tui/readlineWorkspace.ts

@@ -1,5 +1,6 @@
 import { createInterface } from "node:readline";
 import { stdin as defaultInput, stdout as defaultOutput } from "node:process";
+import { join } from "node:path";
 import { runAgentTurn, type RunAgentTurnResult } from "../client/agentRun";
 import { compactDialog, type CompactDialogResult } from "../client/compactDialog";
 import { runSelfUpdate } from "../updateCommands";
@@ -21,7 +22,9 @@ type WorkspaceOptions = {
   env?: NodeJS.ProcessEnv;
   input?: NodeJS.ReadableStream;
   output?: NodeJS.WritableStream;
+  cliEntrypointPath?: string;
   agentRunner?: typeof runAgentTurn;
+  cliCommandRunner?: CliCommandRunner;
   compactRunner?: (options: {
     serverUrl: string;
     authToken: string;
@@ -30,6 +33,16 @@ type WorkspaceOptions = {
   selfUpdater?: SelfUpdater;
 };
 
+type CliCommandRunner = (
+  args: string[],
+  context: {
+    env: NodeJS.ProcessEnv;
+    output: NodeJS.WritableStream;
+    scriptDir: string;
+    cliEntrypointPath: string;
+  }
+) => Promise<number>;
+
 async function runAgentChat(
   scriptDir: string,
   state: TuiState,
@@ -52,10 +65,48 @@ async function runAgentChat(
   return result;
 }
 
+async function pipeReadableToOutput(
+  readable: ReadableStream<Uint8Array> | null,
+  output: NodeJS.WritableStream
+) {
+  if (!readable) return;
+  const text = await new Response(readable).text();
+  if (text) output.write(text);
+}
+
+function resolveDefaultCliEntrypoint(scriptDir: string) {
+  if (process.argv[1]) return process.argv[1];
+  return join(scriptDir, "..", "packages", "cli", "index.ts");
+}
+
+async function runCliCommandInChildProcess(
+  args: string[],
+  context: {
+    env: NodeJS.ProcessEnv;
+    output: NodeJS.WritableStream;
+    cliEntrypointPath: string;
+  }
+) {
+  const proc = Bun.spawn({
+    cmd: [process.execPath, context.cliEntrypointPath, ...args],
+    stdout: "pipe",
+    stderr: "pipe",
+    env: context.env,
+  });
+  await Promise.all([
+    pipeReadableToOutput(proc.stdout, context.output),
+    pipeReadableToOutput(proc.stderr, context.output),
+  ]);
+  return proc.exited;
+}
+
 export async function startTuiWorkspace(options: WorkspaceOptions) {
   let state = createInitialTuiState(options.env ?? process.env);
   const input = options.input ?? defaultInput;
   const output = options.output ?? defaultOutput;
+  const cliEntrypointPath =
+    options.cliEntrypointPath ?? resolveDefaultCliEntrypoint(options.scriptDir);
+  const cliCommandRunner = options.cliCommandRunner ?? runCliCommandInChildProcess;
   const selfUpdater: SelfUpdater =
     options.selfUpdater ?? ((target) => runSelfUpdate({ output: target }));
   const rl = createInterface({ input, output });
@@ -113,6 +164,24 @@ export async function startTuiWorkspace(options: WorkspaceOptions) {
         }
       }
 
+      if (result.action?.type === "cli-command") {
+        try {
+          const exitCode = await cliCommandRunner(result.action.args, {
+            env: options.env ?? process.env,
+            output,
+            scriptDir: options.scriptDir,
+            cliEntrypointPath,
+          });
+          if (exitCode !== 0) {
+            output.write(`[nolo] CLI command exited with code ${exitCode}.\n`);
+          }
+        } catch (error) {
+          output.write(
+            `[nolo] CLI command failed: ${error instanceof Error ? error.message : String(error)}\n`
+          );
+        }
+      }
+
       if (result.action?.type === "chat") {
         const runResult = await runAgentChat(
           options.scriptDir,

package/cli/tui/session.ts

@@ -63,6 +63,10 @@ export type TuiAction =
   | {
       type: "self-update";
     }
+  | {
+      type: "cli-command";
+      args: string[];
+    }
   | {
       type: "exit";
     };
@@ -152,7 +156,7 @@ export function renderTuiHelp() {
     "  /version              Show version/update hint",
     "  /exit                 Leave the workspace",
     "",
-    "You can also type normally. nolo will send it to the current agent.",
+    "You can also type normally. nolo routes simple read/status requests to CLI commands and sends the rest to the current agent.",
   ].join("\n");
 }
 
@@ -203,6 +207,165 @@ function resolveSwitchTarget(rawTarget: string) {
   return null;
 }
 
+const DIALOG_ID_PATTERN = /[0-9A-HJKMNP-TV-Z]{26}/i;
+const DIALOG_KEY_PATTERN = /dialog-[^\s"'<>]+-[0-9A-HJKMNP-TV-Z]{26}/i;
+const DIALOG_URL_PATTERN = /https?:\/\/[^\s"'<>]+\/(?:space\/[^/\s"'<>]+\/)?dialog-[^\s"'<>]+-[0-9A-HJKMNP-TV-Z]{26}\/?/i;
+const GENERIC_TOKEN_PATTERN = /(?:agent-pub-|agent-|space-|page-|meta-)?[A-Za-z0-9][A-Za-z0-9._:/-]{2,}/;
+
+function parseChineseSmallNumber(value: string) {
+  const normalized = value.trim();
+  const direct: Record<string, number> = {
+    一: 1,
+    二: 2,
+    两: 2,
+    三: 3,
+    四: 4,
+    五: 5,
+    六: 6,
+    七: 7,
+    八: 8,
+    九: 9,
+    十: 10,
+  };
+  if (direct[normalized]) return direct[normalized];
+  const teen = normalized.match(/^十([一二两三四五六七八九])$/);
+  if (teen) return 10 + direct[teen[1]];
+  const tens = normalized.match(/^([一二两三四五六七八九])十([一二两三四五六七八九])?$/);
+  if (tens) return direct[tens[1]] * 10 + (tens[2] ? direct[tens[2]] : 0);
+  return null;
+}
+
+function resolveDialogListLimit(input: string) {
+  const digitMatch =
+    input.match(/(?:最近|前|latest|last)?\s*(\d{1,3})\s*(?:个|条|篇)?\s*(?:对话|dialogs?)/i) ??
+    input.match(/(?:对话|dialogs?).*?(?:最近|前|latest|last)?\s*(\d{1,3})\s*(?:个|条|篇)?/i);
+  if (digitMatch) {
+    const parsed = Number(digitMatch[1]);
+    if (Number.isInteger(parsed) && parsed > 0) return String(parsed);
+  }
+
+  const chineseMatch =
+    input.match(/(?:最近|前)?\s*([一二两三四五六七八九十]{1,3})\s*(?:个|条|篇)?\s*对话/) ??
+    input.match(/对话.*?(?:最近|前)?\s*([一二两三四五六七八九十]{1,3})\s*(?:个|条|篇)?/);
+  if (chineseMatch) {
+    const parsed = parseChineseSmallNumber(chineseMatch[1]);
+    if (parsed && parsed > 0) return String(parsed);
+  }
+
+  return undefined;
+}
+
+function extractDialogRef(input: string) {
+  return (
+    input.match(DIALOG_URL_PATTERN)?.[0] ??
+    input.match(DIALOG_KEY_PATTERN)?.[0] ??
+    input.match(DIALOG_ID_PATTERN)?.[0] ??
+    null
+  );
+}
+
+function extractTokenAfterKeywords(input: string, keywords: string[]) {
+  for (const keyword of keywords) {
+    const escaped = keyword.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const match = input.match(new RegExp(`${escaped}\\s+(${GENERIC_TOKEN_PATTERN.source})`, "i"));
+    if (match?.[1]) return match[1];
+  }
+  return null;
+}
+
+function formatCliCommand(args: string[]) {
+  return `nolo ${args.join(" ")}`;
+}
+
+function wantsList(input: string) {
+  return /(列出|列表|有哪些|所有|我的|list|show all)/i.test(input);
+}
+
+function wantsRead(input: string) {
+  return /(读|读取|查看|打开|查询|read|show|open)/i.test(input);
+}
+
+function wantsAnalysisOrComposition(input: string) {
+  return /(总结|汇总|分析|归纳|对比|解释|整理|summary|summari[sz]e|analy[sz]e|compare)/i.test(input);
+}
+
+function resolveSystemCliCommand(input: string) {
+  if (/(我.*登录.*谁|当前.*登录|whoami|who am i)/i.test(input)) {
+    return ["whoami"];
+  }
+  if (/(版本|version)/i.test(input) && /(?:nolo|cli|版本|version)/i.test(input)) {
+    return ["version"];
+  }
+  if (/(诊断|doctor|健康检查|health)/i.test(input) && /(?:nolo|cli|诊断|doctor)/i.test(input)) {
+    return ["doctor"];
+  }
+  return null;
+}
+
+function resolveResourceCliCommand(input: string) {
+  if (/(agent|代理|智能体)/i.test(input)) {
+    if (wantsList(input)) return ["agent", "list"];
+    if (wantsRead(input)) {
+      const agentRef = extractTokenAfterKeywords(input, ["agent", "代理", "智能体"]);
+      if (agentRef) return ["agent", "read", agentRef];
+    }
+  }
+
+  if (/(space|空间)/i.test(input)) {
+    if (wantsList(input)) return ["space", "list"];
+    if (wantsRead(input)) {
+      const spaceRef = extractTokenAfterKeywords(input, ["space", "空间"]);
+      if (spaceRef) return ["space", "read", spaceRef];
+    }
+  }
+
+  if (/(skill-doc|skill doc|技能文档|技能)/i.test(input)) {
+    if (wantsRead(input)) {
+      const docRef = extractTokenAfterKeywords(input, ["skill-doc", "skill doc", "技能文档", "技能"]);
+      if (docRef) return ["skill-doc", "read", docRef];
+    }
+  }
+
+  if (/(doc|文档|page)/i.test(input)) {
+    if (wantsRead(input)) {
+      const docRef = extractTokenAfterKeywords(input, ["doc", "文档", "page"]);
+      if (docRef) return ["doc", "read", docRef];
+    }
+  }
+
+  if (/(table|表格|表|任务表)/i.test(input) && /(查询|查看|读取|query|read|show)/i.test(input)) {
+    const tableRef = extractTokenAfterKeywords(input, ["table", "表格", "表", "任务表"]);
+    if (tableRef) return ["table", "query", "--table", tableRef];
+  }
+
+  return null;
+}
+
+export function resolveNaturalLanguageCliCommand(input: string): string[] | null {
+  const normalized = input.trim();
+  if (!normalized) return null;
+
+  const systemCommand = resolveSystemCliCommand(normalized);
+  if (systemCommand) return systemCommand;
+
+  if (/(对话|dialog)/i.test(normalized)) {
+    const dialogRef = extractDialogRef(normalized);
+    if (dialogRef && wantsRead(normalized)) {
+      return ["dialog", "read", dialogRef];
+    }
+
+    const shouldList = /(查|查询|查看|列出|找|最近|list|show|latest|recent)/i.test(normalized);
+    if (shouldList && !dialogRef && !wantsAnalysisOrComposition(normalized)) {
+      const args = ["dialog", "list"];
+      const limit = resolveDialogListLimit(normalized);
+      if (limit) args.push("--limit", limit);
+      return args;
+    }
+  }
+
+  return resolveResourceCliCommand(normalized);
+}
+
 export function handleTuiInput(input: string, state: TuiState): TuiInputResult {
   const trimmed = input.trim();
   if (!trimmed) {
@@ -210,6 +373,18 @@ export function handleTuiInput(input: string, state: TuiState): TuiInputResult {
   }
 
   if (!trimmed.startsWith("/")) {
+    const cliArgs = resolveNaturalLanguageCliCommand(trimmed);
+    if (cliArgs) {
+      return {
+        nextState: state,
+        output: `[nolo] ${formatCliCommand(cliArgs)}`,
+        action: {
+          type: "cli-command",
+          args: cliArgs,
+        },
+      };
+    }
+
     return {
       nextState: state,
       output: "",

package/cliEnvHelpers.ts

@@ -96,14 +96,18 @@ export function resolveAuthToken(
 }
 
 export function parseUserIdFromAuthToken(token: string) {
-  const payload = token.trim().split(".")[0];
-  if (!payload) return "";
-  try {
-    const parsed = JSON.parse(Buffer.from(payload, "base64").toString("utf8"));
-    return typeof parsed?.userId === "string" ? parsed.userId : "";
-  } catch {
-    return "";
+  const parts = token.trim().split(".").filter(Boolean);
+  const payloadCandidates = parts.length >= 3 ? [parts[1], parts[0]] : [parts[0]];
+  for (const payload of payloadCandidates) {
+    if (!payload) continue;
+    try {
+      const parsed = JSON.parse(Buffer.from(payload, "base64").toString("utf8"));
+      if (typeof parsed?.userId === "string") return parsed.userId;
+    } catch {
+      // Try the next token shape.
+    }
   }
+  return "";
 }
 
 export function readOption(args: string[], flag: string) {

package/client/agentConfigResolver.test.ts

@@ -16,7 +16,7 @@ describe("agent config resolver", () => {
       customProviderUrl: "https://provider.example/v1",
       toolNames: ["legacyTool", "readFile"],
       tools: ["readFile", "applyEdit"],
-      runtimeBinding: { machineId: "machine-1", localWorkspaceMode: "task-worktree" },
+      runtimeBinding: { machineId: "machine-1" },
       delegation: { target: "local" },
       temperature: 0.2,
       top_p: 0.9,
@@ -34,8 +34,7 @@ describe("agent config resolver", () => {
       cliProvider: "codex",
       customProviderUrl: "https://provider.example/v1",
       toolNames: ["legacyTool", "readFile", "applyEdit"],
-      runtimeBinding: { machineId: "machine-1", localWorkspaceMode: "task-worktree" },
-      localWorkspaceMode: "task-worktree",
+      runtimeBinding: { machineId: "machine-1" },
       delegation: { target: "local" },
       temperature: 0.2,
       top_p: 0.9,