nolo-cli 0.1.23 → 0.1.29

package/ai/tools/createPlanTool.ts

@@ -20,21 +20,21 @@ import {
   type ToolCall,
   type ReflectDecision,
   type PlanExecutionConfig,
-} from "ai/agent/planSlice";
+} from "../agent/planSlice";
 // ✅ 不再直接在 Plan 里使用 runLlm / runAgent，统一走 toolExecutors
-// import { runLlm, runAgent } from "ai/agent/agentSlice";
-import { toolExecutors, toolDefinitionsByName } from "ai/tools";
+// import { runLlm, runAgent } from "../agent/agentSlice";
+import { toolExecutors, toolDefinitionsByName } from "../tools";
 import {
   toolRunStarted,
   toolRunSucceeded,
   toolRunFailed,
   createToolRunId,
-} from "ai/tools/toolRunSlice";
-import type { RootState } from "app/store";
-import { selectCurrentDialogConfig } from "chat/dialog/dialogSlice";
-import { messageStreamEnd, messageStreaming } from "chat/messages/messageSlice";
-import { extractCustomId } from "core/prefix";
-import { createDialogMessageKeyAndId } from "database/keys";
+} from "../tools/toolRunSlice";
+import type { RootState } from "../../app/store";
+import { selectCurrentDialogConfig } from "../../chat/dialog/dialogSlice";
+import { messageStreamEnd, messageStreaming } from "../../chat/messages/messageSlice";
+import { extractCustomId } from "../../core/prefix";
+import { createDialogMessageKeyAndId } from "../../database/keys";
 import { callAgentFunc } from "./agent/callAgentTool";
 const PLAN_EXECUTOR_CYBOT_KEY = "PLAN_EXECUTOR";
 const PLAN_EXECUTOR_AGENT_CONFIG = { dbKey: PLAN_EXECUTOR_CYBOT_KEY } as any;

package/ai/tools/createSkillDocTool.ts

@@ -1,10 +1,10 @@
-import { createDoc } from "render/page/docSlice";
-import { selectCurrentSpaceId } from "create/space/spaceSlice";
-import type { RootState } from "app/store";
+import { createDoc } from "../../render/page/docSlice";
+import { selectCurrentSpaceId } from "../../create/space/spaceSlice";
+import type { RootState } from "../../app/store";
 import {
   buildSkillDocFromArgs,
   type CreateSkillDocArgs,
-} from "ai/skills/skillDocBuilder";
+} from "../skills/skillDocBuilder";
 import { buildSkillFollowupResult } from "./skillFollowup";
 
 export interface CreateSkillDocToolArgs extends CreateSkillDocArgs {

package/ai/tools/createWorkflowTool.ts

@@ -10,11 +10,11 @@
  * Use agent loop when the path needs dynamic discovery.
  */
 
-import { runWorkflow } from "ai/workflow/workflowExecutor";
+import { runWorkflow } from "../workflow/workflowExecutor";
 import type {
   WorkflowDefinition,
   WorkflowStep,
-} from "ai/workflow/workflowTypes";
+} from "../workflow/workflowTypes";
 
 export const createWorkflowFunctionSchema = {
   name: "createWorkflow",

package/ai/tools/deleteSpacesTool.ts

@@ -1,8 +1,8 @@
-import { selectUserId } from "auth/authSlice";
-import { createSpaceKey } from "create/space/spaceKeys";
-import { deleteSpace, selectAllMemberSpaces } from "create/space/spaceSlice";
-import { read } from "database/dbSlice";
-import { getRuntimeServerContext } from "database/runtimeServerContext";
+import { selectUserId } from "../../auth/authSlice";
+import { createSpaceKey } from "../../create/space/spaceKeys";
+import { deleteSpace, selectAllMemberSpaces } from "../../create/space/spaceSlice";
+import { read } from "../../database/dbSlice";
+import { getRuntimeServerContext } from "../../database/runtimeServerContext";
 
 import {
   buildDeleteSpacesPreview,

package/ai/tools/deleteSpacesToolModel.ts

@@ -1,4 +1,4 @@
-import { normalizeSpaceId } from "create/space/spaceKeys";
+import { normalizeSpaceId } from "../../create/space/spaceKeys";
 
 export type DeleteSpacesMatchMode = "prefix" | "exact" | "contains" | "spaceId";
 

package/ai/tools/doctorSkillTool.ts

@@ -1,6 +1,6 @@
-import { readAction } from "database/actions/read";
-import type { PageData } from "render/page/types";
-import { diagnoseSkillDocument } from "ai/skills/skillDiagnostics";
+import { readAction } from "../../database/actions/read";
+import type { PageData } from "../../render/page/types";
+import { diagnoseSkillDocument } from "../skills/skillDiagnostics";
 
 export interface DoctorSkillToolArgs {
   id?: string;

package/ai/tools/evalSkillTool.ts

@@ -1,6 +1,6 @@
-import { readAction } from "database/actions/read";
-import type { PageData } from "render/page/types";
-import { evaluateSkillDocument } from "ai/skills/skillDiagnostics";
+import { readAction } from "../../database/actions/read";
+import type { PageData } from "../../render/page/types";
+import { evaluateSkillDocument } from "../skills/skillDiagnostics";
 
 export interface EvalSkillToolArgs {
   id?: string;

package/ai/tools/{execBashTool.ts → execShellTool.ts}

@@ -1,9 +1,10 @@
-import { DEFAULT_LOCAL_API_ORIGIN } from "core/localOrigins";
-import { callToolApi } from "./toolApiClient";
+import { DEFAULT_LOCAL_API_ORIGIN } from "../../core/localOrigins";
+import { callToolApi } from "./toolApiClient";
+import { ToolResultError } from "./toolResultError";
 
 type ExecShellKind = "auto" | "bash" | "powershell";
 
-type ExecBashRequestArgs = {
+type ExecShellRequestArgs = {
   command?: string;
   cwd?: string;
   interactive?: boolean;
@@ -14,58 +15,7 @@ type ExecBashRequestArgs = {
   close?: boolean;
 };
 
-export const execBashFunctionSchema = {
-  name: "execBash",
-  description:
-    "兼容旧 agent 的 shell 执行工具。底层会调用后端 shell 执行接口；在 Windows 上可能自动回退到 PowerShell。环境不明确时，先调用 checkEnv({check:'context'}) 判断当前平台与可用 shell。支持交互式 session：先用 interactive=true 启动，再通过 sessionId + input 继续写入 stdin，或用 sessionId 单独轮询输出。仅用于本地开发环境。对 rm 等危险命令默认拦截，需显式传 unsafe: true 才会执行。不要用它执行 rg/grep 代码搜索；代码搜索请改用 codeSearch。",
-  parameters: {
-    type: "object",
-    properties: {
-      command: {
-        type: "string",
-        description:
-          "要执行的 shell 命令，例如: 'git status --short', 'bun test --watch=false'。",
-      },
-      cwd: {
-        type: "string",
-        description:
-          "可选：命令执行的工作目录（相对于 diff-server 所在机器），默认使用后端的 process.cwd()。",
-      },
-      unsafe: {
-        type: "boolean",
-        description:
-          "可选：是否允许执行被判定为危险的命令（例如 rm -rf）。默认 false；当为 false 且命令被识别为危险时，会直接拦截而不真正执行。",
-      },
-      interactive: {
-        type: "boolean",
-        description:
-          "可选：是否以交互式 session 启动命令。为 true 时接口会立即返回 sessionId，后续可继续写 stdin 或轮询输出。",
-      },
-      pty: {
-        type: "boolean",
-        description:
-          "可选：是否为交互式 session 分配伪终端（PTY）。适合 python -i、bash、node 等真正依赖终端语义的 REPL。",
-      },
-      sessionId: {
-        type: "string",
-        description:
-          "可选：已存在的交互式 sessionId。传入后可继续写入 input、查询最新输出或关闭该 session。",
-      },
-      input: {
-        type: "string",
-        description:
-          "可选：要写入 session stdin 的文本。通常需要自己补换行，例如 'y\\n' 或 'exit\\n'。",
-      },
-      close: {
-        type: "boolean",
-        description:
-          "可选：是否关闭指定 session。通常与 sessionId 搭配使用。",
-      },
-    },
-  },
-};
-
-export const execShellFunctionSchema = {
+export const execShellFunctionSchema = {
   name: "execShell",
   description:
     "跨平台 shell 执行工具。会在 Windows 上优先使用 PowerShell，在 Linux/macOS 上使用 bash。环境不明确时，先调用 checkEnv({check:'context'}) 判断当前平台与可用 shell。支持交互式 session：先用 interactive=true 启动，再通过 sessionId + input 继续写入 stdin，或用 sessionId 单独轮询输出。仅用于本地开发环境。对 rm 等危险命令默认拦截，需显式传 unsafe: true 才会执行。不要用它执行 rg/grep 代码搜索；代码搜索请改用 codeSearch。",
@@ -143,9 +93,9 @@ function isDangerousCommand(rawCommand: string): boolean {
 }
 
 async function requestExec(
-  args: ExecBashRequestArgs,
+  args: ExecShellRequestArgs,
   thunkApi?: any,
-  endpoint = "/api/exec-bash",
+  endpoint = "/api/exec-shell",
   context?: { agentKey?: string },
 ): Promise<any> {
   const payload = Object.fromEntries(
@@ -163,12 +113,16 @@ async function requestExec(
     (typeof process !== "undefined" &&
       (process as any).env?.DIFF_SERVER_ORIGIN) ||
     (typeof window !== "undefined" ? window.location.origin : DEFAULT_LOCAL_API_ORIGIN);
-  const url = `${baseUrl}${endpoint}`;
-  const res = await fetch(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(payload),
-  });
+  const url = `${baseUrl}${endpoint}`;
+  const headers: Record<string, string> = { "Content-Type": "application/json" };
+  if (typeof window !== "undefined" && (window as any).__NOLO_DESKTOP__) {
+    headers["X-Nolo-Desktop-Tool"] = "1";
+  }
+  const res = await fetch(url, {
+    method: "POST",
+    headers,
+    body: JSON.stringify(payload),
+  });
 
   const text = await res.text();
   try {
@@ -178,7 +132,7 @@ async function requestExec(
   }
 }
 
-function formatExecResult(prefixLabel: string, args: any, json: any, trimmedCommand: string, sessionId?: string) {
+function formatExecResult(prefixLabel: string, args: any, json: any, trimmedCommand: string, sessionId?: string) {
   const prefix = json?.ok === false || json?.error ? `[${prefixLabel} 失败]` : `[${prefixLabel} 成功]`;
   const stdout = json.stdout ?? "";
   const stderr = json.stderr ?? "";
@@ -219,10 +173,20 @@ function formatExecResult(prefixLabel: string, args: any, json: any, trimmedComm
       ...json,
     },
     displayData: displayParts.join("\n"),
-  };
-}
+  };
+}
+
+function throwExecToolError(toolName: "execShell", message: string, rawData?: any): never {
+  const displayData = `${toolName} 调用失败：${message}`;
+  throw new ToolResultError(displayData, {
+    code: "EXEC_TOOL_FAILED",
+    rawData: rawData ?? { error: displayData },
+    displayData,
+    retryable: true,
+  });
+}
 
-function buildBlockedResponse(toolName: "execBash" | "execShell", trimmedCommand: string, cwd?: string, shell?: ExecShellKind) {
+function buildBlockedResponse(toolName: "execShell", trimmedCommand: string, cwd?: string, shell?: ExecShellKind) {
   const lines: string[] = [];
   lines.push(`[${toolName} 拦截] 检测到潜在危险命令，默认不执行。`);
   lines.push(`command: ${trimmedCommand}`);
@@ -247,57 +211,7 @@ function buildBlockedResponse(toolName: "execBash" | "execShell", trimmedCommand
   };
 }
 
-export const startExecBashSession = (
-  thunkApi: any,
-  args: { command: string; cwd?: string; pty?: boolean }
-) =>
-  requestExec(
-    {
-      command: args.command,
-      cwd: args.cwd,
-      interactive: true,
-      pty: args.pty,
-    },
-    thunkApi,
-  );
-
-export const writeExecBashSession = (
-  thunkApi: any,
-  args: { sessionId: string; input: string }
-) =>
-  requestExec(
-    {
-      sessionId: args.sessionId,
-      input: args.input,
-    },
-    thunkApi,
-  );
-
-export const readExecBashSession = (
-  thunkApi: any,
-  args: { sessionId: string }
-) =>
-  requestExec(
-    {
-      sessionId: args.sessionId,
-    },
-    thunkApi,
-  );
-
-export const closeExecBashSession = (
-  thunkApi: any,
-  args: { sessionId: string; input?: string }
-) =>
-  requestExec(
-    {
-      sessionId: args.sessionId,
-      input: args.input,
-      close: true,
-    },
-    thunkApi,
-  );
-
-export const startExecShellSession = (
+export const startExecShellSession = (
   thunkApi: any,
   args: { command: string; cwd?: string; pty?: boolean; shell?: ExecShellKind }
 ) =>
@@ -310,43 +224,8 @@ export const startExecShellSession = (
       shell: args.shell,
     },
     thunkApi,
-    "/api/exec-shell",
-  );
-
-export async function execBashFunc(args: any, thunkApi?: any, context?: { agentKey?: string }): Promise<{
-  rawData: any;
-  displayData: string;
-}> {
-  const { command, cwd, unsafe, interactive, pty, sessionId, input, close } = args || {};
-  const isSessionFollowup = typeof sessionId === "string" && sessionId.trim().length > 0;
-
-  if (!isSessionFollowup && (!command || typeof command !== "string")) {
-    const msg = "execBash 需要提供 command，或提供有效的 sessionId 来继续已有交互式 session。";
-    return { rawData: { error: msg }, displayData: msg };
-  }
-
-  const trimmedCommand = typeof command === "string" ? command.trim() : "";
-  if (!isSessionFollowup && !unsafe && isDangerousCommand(trimmedCommand)) {
-    return buildBlockedResponse("execBash", trimmedCommand, cwd);
-  }
-
-  try {
-    const json = await requestExec({
-      ...(trimmedCommand ? { command: trimmedCommand } : {}),
-      ...(cwd ? { cwd } : {}),
-      ...(interactive ? { interactive: true } : {}),
-      ...(pty ? { pty: true } : {}),
-      ...(isSessionFollowup ? { sessionId } : {}),
-      ...(typeof input === "string" ? { input } : {}),
-      ...(close ? { close: true } : {}),
-    }, thunkApi, "/api/exec-bash", context);
-    return formatExecResult("execBash", { cwd }, json, trimmedCommand, sessionId);
-  } catch (error: any) {
-    const msg = `execBash 调用失败：${error?.message || String(error)}`;
-    return { rawData: { error: msg }, displayData: msg };
-  }
-}
-
+  );
+
 export async function execShellFunc(args: any, thunkApi?: any, context?: { agentKey?: string }): Promise<{
   rawData: any;
   displayData: string;
@@ -375,9 +254,13 @@ export async function execShellFunc(args: any, thunkApi?: any, context?: { agent
       ...(typeof input === "string" ? { input } : {}),
       ...(close ? { close: true } : {}),
     }, thunkApi, "/api/exec-shell", context);
-    return formatExecResult("execShell", { cwd, shell }, json, trimmedCommand, sessionId);
-  } catch (error: any) {
-    const msg = `execShell 调用失败：${error?.message || String(error)}`;
-    return { rawData: { error: msg }, displayData: msg };
-  }
-}
+    if (json?.ok === false || json?.error) {
+      const message = typeof json?.error === "string" ? json.error : JSON.stringify(json?.error ?? json);
+      throwExecToolError("execShell", message, { command: trimmedCommand || null, ...json });
+    }
+    return formatExecResult("execShell", { cwd, shell }, json, trimmedCommand, sessionId);
+  } catch (error: any) {
+    if (error instanceof ToolResultError) throw error;
+    throwExecToolError("execShell", error?.message || String(error));
+  }
+}

package/ai/tools/executeSqlTool.ts

@@ -1,7 +1,7 @@
 // /ai/tools/executeSqlTool.ts
 
 import { getToolRequestContext, callToolApi } from "./toolApiClient";
-import { API_ENDPOINTS } from "database/config";
+import { API_ENDPOINTS } from "../../database/config";
 
 /**
  * [Schema] 定义了 'executeSql' 工具的结构，供 LLM 调用。

package/ai/tools/geminiImagePreviewTool.ts

@@ -1,15 +1,15 @@
 // 文件路径: ai/tools/geminiImagePreviewTool.ts
 
 import { callToolApi } from "./toolApiClient";
-import { selectCurrentSpaceId } from "create/space/spaceSlice";
-import { selectUserId } from "auth/authSlice";
-import { selectCurrentServer } from "app/settings/settingSlice";
-import { selectCurrentDialogKey } from "chat/dialog/dialogSlice";
-import { addContentAction } from "create/space/content/addContentAction";
-import { ContentType } from "app/types";
-import { fileKey } from "database/keys";
-import { buildDatabaseFileContentUrl } from "database/fileUrl";
-import { extractCustomId } from "core/prefix";
+import { selectCurrentSpaceId } from "../../create/space/spaceSlice";
+import { selectUserId } from "../../auth/authSlice";
+import { selectCurrentServer } from "../../app/settings/settingSlice";
+import { selectCurrentDialogKey } from "../../chat/dialog/dialogSlice";
+import { addContentAction } from "../../create/space/content/addContentAction";
+import { ContentType } from "../../app/types";
+import { fileKey } from "../../database/keys";
+import { buildDatabaseFileContentUrl } from "../../database/fileUrl";
+import { extractCustomId } from "../../core/prefix";
 
 const DEFAULT_GEMINI_IMAGE_MODEL = "gemini-2.5-flash-image" as const;
 

package/ai/tools/importDataTool.ts

@@ -1,8 +1,8 @@
 // /ai/tools/importDataTool.ts
 
-import type { RootState } from "app/store";
+import type { RootState } from "../../app/store";
 import { executeSqlFunc } from "./executeSqlTool";
-import { selectPendingRawDataByPageKey } from "chat/dialog/dialogSlice";
+import { selectPendingRawDataByPageKey } from "../../chat/dialog/dialogSlice";
 
 // importDataFunctionSchema 保持不变
 export const importDataFunctionSchema = {

package/ai/tools/importSkillTool.ts

@@ -1,12 +1,12 @@
-import { createDoc } from "render/page/docSlice";
-import { selectCurrentSpaceId } from "create/space/spaceSlice";
-import type { RootState } from "app/store";
+import { createDoc } from "../../render/page/docSlice";
+import { selectCurrentSpaceId } from "../../create/space/spaceSlice";
+import type { RootState } from "../../app/store";
 import { canonicalizeToolNames } from "./toolNameAliases";
 import {
   buildSkillDocMarkdown,
   parseExternalSkillMarkdown,
   type SkillDocConfig,
-} from "ai/skills/skillDocProtocol";
+} from "../skills/skillDocProtocol";
 import { buildSkillFollowupResult } from "./skillFollowup";
 
 export interface ImportSkillToolArgs {

package/ai/tools/index.ts

@@ -22,6 +22,7 @@ import {
   createWorkflowFunc,
 } from "./createWorkflowTool";
 import { delayFunctionSchema, delayFunc } from "./delayTool";
+import { canonicalizeToolName } from "./toolNameAliases";
 import {
   completeDialogGoalFunc,
   completeDialogGoalFunctionSchema,
@@ -87,6 +88,8 @@ import {
 import {
   executeApprovedLocalFileChangesFunc,
   executeApprovedLocalFileChangesFunctionSchema,
+  listLocalRootsFunc,
+  listLocalRootsFunctionSchema,
   listLocalFilesFunc,
   listLocalFilesFunctionSchema,
   proposeLocalFileChangesFunc,
@@ -94,6 +97,8 @@ import {
   proposeLocalFileChangesPreviewFunc,
   readLocalFileFunc,
   readLocalFileFunctionSchema,
+  requestLocalFolderAccessFunc,
+  requestLocalFolderAccessFunctionSchema,
   undoLocalFileChangeBatchFunc,
   undoLocalFileChangeBatchFunctionSchema,
 } from "./localFilesTool";
@@ -160,6 +165,10 @@ import {
   fetchWebpageFunctionSchema,
   fetchWebpageFunc,
 } from "./fetchWebpageTool";
+import {
+  convertMarxistsBookToOfflineHtmlFunctionSchema,
+  convertMarxistsBookToOfflineHtmlFunc,
+} from "./convertMarxistsBookTool";
 import {
   readXPostFunctionSchema,
   readXPostFunc,
@@ -281,7 +290,7 @@ import {
   rememberMemoryFunc,
   rememberMemoryFunctionSchema,
 } from "./rememberMemoryTool";
-import { execBashFunctionSchema, execBashFunc, execShellFunctionSchema, execShellFunc } from "./execBashTool";
+import { execShellFunctionSchema, execShellFunc } from "./execShellTool";
 import { checkEnvFunctionSchema, checkEnvFunc } from "./checkEnvTool";
 
 import { agentToolDefinitions } from "./agent/agentTools";
@@ -1367,6 +1376,39 @@ const baseToolDefinitions: ToolDefinition[] = [
     costLevel: "low",
     defaultConsent: "ask",
   },
+  {
+    id: "listLocalRoots",
+    schema: listLocalRootsFunctionSchema,
+    executor: listLocalRootsFunc,
+    description: {
+      name: "listLocalRoots",
+      description: "列出当前桌面客户端里已经授权的本地文件夹 roots。",
+      category: "本地文件",
+    },
+    behavior: "data",
+    uiGroup: "data",
+    capability: "general",
+    riskLevel: "low",
+    costLevel: "low",
+    defaultConsent: "ask",
+  },
+  {
+    id: "requestLocalFolderAccess",
+    schema: requestLocalFolderAccessFunctionSchema,
+    executor: requestLocalFolderAccessFunc,
+    description: {
+      name: "requestLocalFolderAccess",
+      description: "为桌面客户端请求授权一个本地文件夹，并返回可复用的 rootId。",
+      category: "本地文件",
+    },
+    behavior: "action",
+    uiGroup: "data",
+    capability: "general",
+    interaction: "confirm",
+    riskLevel: "medium",
+    costLevel: "low",
+    defaultConsent: "ask",
+  },
   {
     id: "listLocalFiles",
     schema: listLocalFilesFunctionSchema,
@@ -1464,6 +1506,23 @@ const baseToolDefinitions: ToolDefinition[] = [
     },
     behavior: "data",
   },
+  {
+    id: "convertMarxistsBookToOfflineHtml",
+    schema: convertMarxistsBookToOfflineHtmlFunctionSchema,
+    executor: convertMarxistsBookToOfflineHtmlFunc,
+    description: {
+      name: "convertMarxistsBookToOfflineHtml",
+      description:
+        "将 Marxists.org 中文旧式书籍页面转换成保留原 CSS、背景和排版的离线单 HTML。",
+      category: "网络与智能",
+    },
+    behavior: "data",
+    capability: "web_access",
+    riskLevel: "low",
+    costLevel: "medium",
+    defaultConsent: "auto",
+    cancelable: true,
+  },
   {
     id: "readXPost",
     schema: readXPostFunctionSchema,
@@ -1837,18 +1896,6 @@ const baseToolDefinitions: ToolDefinition[] = [
     behavior: "data",
     uiGroup: "general",
   },
-  {
-    id: "execBash",
-    schema: execBashFunctionSchema,
-    executor: execBashFunc,
-    description: {
-      name: "exec_bash",
-      description:
-        "通过后端 diff-server 的 /api/exec-bash 接口执行一条 bash 命令，仅用于本地开发调试。",
-      category: "网络与智能",
-    },
-    behavior: "action",
-  },
   {
     id: "execShell",
     schema: execShellFunctionSchema,
@@ -2070,7 +2117,7 @@ export const findToolExecutor = (
   executor: ToolDefinition["executor"];
   canonicalName: string;
 } => {
-  const normalizedRawName = normalizeToolName(rawName);
+  const normalizedRawName = normalizeToolName(canonicalizeToolName(rawName));
   const canonicalName = Object.keys(toolExecutors).find(
     (key) => normalizeToolName(key) === normalizedRawName
   );

package/ai/tools/listUserSpacesTool.ts

@@ -12,8 +12,8 @@
  * - 跨 Space 导航
  */
 
-import type { RootState } from "app/store";
-import { selectAllMemberSpaces } from "create/space/spaceSlice";
+import type { RootState } from "../../app/store";
+import { selectAllMemberSpaces } from "../../create/space/spaceSlice";
 
 // ---- Types ----