nolo-cli 0.1.23 → 0.1.26

package/ai/tools/agent/prepareAgentDraftTool.ts

@@ -0,0 +1,159 @@
+import { DEFAULT_MODEL } from "ai/llm/providers";
+import {
+  GUIDED_AGENT_CAPABILITIES,
+  mapCapabilityIdsToToolIds,
+} from "ai/agent/guidedCreation/capabilities";
+import type {
+  GuidedAgentCapabilityId,
+  GuidedAgentDraft,
+  GuidedAgentReferenceChoice,
+} from "ai/agent/guidedCreation/types";
+
+export type PrepareAgentDraftToolArgs = Partial<GuidedAgentDraft>;
+
+const capabilityIds = new Set(Object.keys(GUIDED_AGENT_CAPABILITIES));
+
+const trim = (value: unknown) =>
+  typeof value === "string" ? value.trim() : "";
+
+const stringArray = (value: unknown): string[] =>
+  Array.isArray(value)
+    ? value.map((item) => trim(item)).filter(Boolean)
+    : [];
+
+const guidedCapabilityArray = (value: unknown): GuidedAgentCapabilityId[] =>
+  stringArray(value).filter((id): id is GuidedAgentCapabilityId =>
+    capabilityIds.has(id)
+  );
+
+const referencesArray = (value: unknown): GuidedAgentReferenceChoice[] =>
+  Array.isArray(value)
+    ? value
+        .filter((item): item is Record<string, unknown> =>
+          !!item && typeof item === "object" && !Array.isArray(item)
+        )
+        .map((item) => ({
+          dbKey: trim(item.dbKey),
+          title: trim(item.title),
+          type: item.type === "instruction" ? "instruction" : "knowledge",
+          selected: item.selected === true,
+          ...(trim(item.reason) ? { reason: trim(item.reason) } : {}),
+        }))
+        .filter((item) => item.dbKey)
+    : [];
+
+const buildPrompt = (args: PrepareAgentDraftToolArgs) => {
+  const prompt = trim(args.prompt);
+  if (prompt) return prompt;
+  const name = trim(args.name) || "用户的专属 AI";
+  const summary = trim(args.promptSummary) || trim(args.introduction);
+  return [
+    `你是${name}。`,
+    summary || "你需要理解用户目标，并给出清晰、可执行、有边界的帮助。",
+    "如果信息不足，先提出必要澄清问题；不要编造用户没有确认的资料来源。",
+  ].join("\n");
+};
+
+export const buildPreparedAgentDraft = (
+  args: PrepareAgentDraftToolArgs
+): GuidedAgentDraft => {
+  const selectedCapabilities = guidedCapabilityArray(args.capabilityIds);
+  const providedToolIds = stringArray(args.toolIds);
+  const mappedToolIds = mapCapabilityIdsToToolIds(selectedCapabilities);
+  return {
+    name: trim(args.name),
+    introduction: trim(args.introduction),
+    prompt: buildPrompt(args),
+    promptSummary: trim(args.promptSummary),
+    provider: trim(args.provider) || DEFAULT_MODEL.provider,
+    model: trim(args.model) || DEFAULT_MODEL.name,
+    isPublic: args.isPublic === true,
+    capabilityIds: selectedCapabilities,
+    toolIds: Array.from(new Set([...providedToolIds, ...mappedToolIds])),
+    references: referencesArray(args.references),
+    tags: stringArray(args.tags),
+    unresolved: stringArray(args.unresolved),
+  };
+};
+
+export const prepareAgentDraftToolFunctionSchema = {
+  name: "prepareAgentDraft",
+  description:
+    "整理一个可预览的 Agent 创建草稿。只生成草稿，不创建真实 Agent 记录。",
+  parameters: {
+    type: "object",
+    properties: {
+      name: { type: "string", description: "建议的 Agent 名称。" },
+      introduction: { type: "string", description: "面向用户展示的简介。" },
+      prompt: { type: "string", description: "完整系统 prompt 草稿。" },
+      promptSummary: { type: "string", description: "prompt 的简短摘要。" },
+      provider: { type: "string", description: "建议 provider。" },
+      model: { type: "string", description: "建议模型名称。" },
+      isPublic: { type: "boolean", description: "是否建议公开。" },
+      capabilityIds: {
+        type: "array",
+        items: {
+          type: "string",
+          enum: Object.keys(GUIDED_AGENT_CAPABILITIES),
+        },
+        description: "已确认或高度确定的能力标签。",
+      },
+      toolIds: {
+        type: "array",
+        items: { type: "string" },
+        description: "可选的底层工具名；通常由 capabilityIds 推导。",
+      },
+      references: {
+        type: "array",
+        items: {
+          type: "object",
+          properties: {
+            dbKey: { type: "string" },
+            title: { type: "string" },
+            type: { type: "string", enum: ["knowledge", "instruction"] },
+            selected: { type: "boolean" },
+            reason: { type: "string" },
+          },
+          required: ["dbKey"],
+        },
+        description: "建议挂载的知识引用，默认等待用户确认。",
+      },
+      tags: {
+        type: "array",
+        items: { type: "string" },
+      },
+      unresolved: {
+        type: "array",
+        items: { type: "string" },
+        description: "仍需确认的字段或问题。",
+      },
+    },
+    required: ["name", "introduction", "promptSummary"],
+  },
+};
+
+export async function prepareAgentDraftToolFunc(
+  args: PrepareAgentDraftToolArgs
+): Promise<{
+  rawData: { draft: GuidedAgentDraft; createUrl: string };
+  displayData: string;
+}> {
+  const draft = buildPreparedAgentDraft(args);
+  const missing = draft.unresolved.length
+    ? `\n- 待确认: ${draft.unresolved.join(", ")}`
+    : "";
+  return {
+    rawData: {
+      draft,
+      createUrl: "/create/agent",
+    },
+    displayData: [
+      `Agent 草稿: ${draft.name || "未命名 AI"}`,
+      draft.promptSummary ? `- 摘要: ${draft.promptSummary}` : "",
+      draft.capabilityIds.length
+        ? `- 能力: ${draft.capabilityIds.join(", ")}`
+        : "",
+      missing,
+    ].filter(Boolean).join("\n"),
+  };
+}

package/ai/tools/checkEnvTool.ts

@@ -3,39 +3,60 @@
 
 import { callToolApi } from "./toolApiClient";
 
-export type CheckEnvArgs = {
-    check?: "build" | "context";
-};
+export type CheckEnvArgs = {
+    check?: "build" | "context";
+    key?: string;
+};
 
 export const checkEnvFunctionSchema = {
     name: "checkEnv",
     description: [
-        "执行环境检查并返回结构化结果。",
-        "check='context' 可查看当前平台、工作目录与可用 shell；check='build' 可快速验证是否可编译。",
+        "执行环境检查并返回结构化结果。",
+        "check='context' 可查看当前平台、工作目录与可用 shell；check='build' 可快速验证是否可编译。",
+        "key 可检查某个本地工具，例如 key='gemini' 会探测本机 Gemini CLI 与 npm 最新版本。",
     ].join("\n"),
     parameters: {
         type: "object",
         properties: {
-            check: {
-                type: "string",
-                enum: ["build", "context"],
-                description: "检查项：context 返回当前运行环境；build 执行构建检查。",
-            },
-        },
-    },
-};
+            check: {
+                type: "string",
+                enum: ["build", "context"],
+                description: "检查项：context 返回当前运行环境；build 执行构建检查。",
+            },
+            key: {
+                type: "string",
+                enum: ["gemini", "node", "npm", "bun", "python", "git", "shell"],
+                description: "可选：探测某个本地工具，不执行 build。常用值如 gemini、node、npm、bun、python、git、shell。",
+            },
+        },
+    },
+};
+
+const formatProbeOutput = (probe: any): string => {
+    const status = probe?.ok ? "OK" : "FAIL";
+    const lines = [`- [${status}] ${probe?.label ?? "probe"}`];
+    const stdout = typeof probe?.stdout === "string" ? probe.stdout.trim() : "";
+    const stderr = typeof probe?.stderr === "string" ? probe.stderr.trim() : "";
+    const error = typeof probe?.error === "string" ? probe.error.trim() : "";
+    if (stdout) lines.push(`  stdout: ${stdout}`);
+    if (stderr) lines.push(`  stderr: ${stderr}`);
+    if (error) lines.push(`  error: ${error}`);
+    return lines.join("\n");
+};
 
 export async function checkEnvFunc(
     args: CheckEnvArgs,
     thunkApi: any,
     context?: { agentKey?: string }
 ): Promise<{ rawData: any; displayData: string }> {
-    const check = args?.check === "context" ? "context" : "build";
-
+    const key = typeof args?.key === "string" ? args.key.trim().toLowerCase() : "";
+    const check = args?.check === "context" ? "context" : "build";
+    const payload = key ? { key } : { check };
+
     const result = await callToolApi<any>(
         thunkApi,
         "/api/check-env",
-        { check },
+        payload,
         {
             withAuth: true,
             agentKey: context?.agentKey,
@@ -45,7 +66,18 @@ export async function checkEnvFunc(
     const ok = !!result?.ok;
     const exitCode = typeof result?.exitCode === "number" ? result.exitCode : -1;
 
-    if (check === "context") {
+    if (result?.check === "tool") {
+        const probes = Array.isArray(result?.probes) ? result.probes : [];
+        return {
+            rawData: result,
+            displayData: [
+                `本地工具检查: ${result?.key ?? key}`,
+                ...probes.map(formatProbeOutput),
+            ].join("\n"),
+        };
+    }
+
+    if (check === "context") {
         const displayParts = [
             `平台: ${result?.platform ?? "unknown"}`,
             `cwd: ${result?.cwd ?? "unknown"}`,
@@ -59,9 +91,9 @@ export async function checkEnvFunc(
             rawData: result,
             displayData: `🧭 当前环境\n${displayParts.join("\n")}`,
         };
-    }
-
-    return {
+    }
+
+    return {
         rawData: result,
         displayData: ok
             ? `✅ 环境检查通过: ${check}`

package/ai/tools/convertMarxistsBookTool.ts

@@ -0,0 +1,103 @@
+import { convertMarxistsBookToOfflineHtml } from "./marxistsOfflineBook";
+
+export const convertMarxistsBookToOfflineHtmlFunctionSchema = {
+  name: "convertMarxistsBookToOfflineHtml",
+  description:
+    "将 Marxists.org 中文旧式书籍页面转换成离线单 HTML。会从章节 URL 推导目录页，下载同目录章节、CSS 和背景图，保留原始排版并内嵌资源，适合 iPad/移动设备离线阅读。",
+  parameters: {
+    type: "object",
+    properties: {
+      startUrl: {
+        type: "string",
+        description:
+          "任意一个 Marxists.org 中文书籍章节 URL，例如 https://www.marxists.org/chinese/fromm/1973/01.htm。",
+      },
+      encoding: {
+        type: "string",
+        description: "源站 HTML/CSS 编码，老中文页面通常是 gb2312。默认 gb2312。",
+        default: "gb2312",
+      },
+      outputMode: {
+        type: "string",
+        enum: ["summary", "html"],
+        description:
+          "summary 只返回元数据和文件引用；html 同时返回完整 HTML 字符串。需要直接拿到文件内容时用 html。",
+        default: "summary",
+      },
+      singleFileName: {
+        type: "string",
+        description:
+          "生成文件建议名称，默认根据书名或 URL 生成；server-side agent 可用它作为保存文件名。",
+      },
+      maxPages: {
+        type: "number",
+        description: "最多允许抓取的同目录章节页数量，默认 80，防止误抓整个站点。",
+        default: 80,
+      },
+      saveAsFile: {
+        type: "boolean",
+        description:
+          "server-side agent 可设为 true，将 HTML 保存为 Nolo 文件并返回下载 URL；如果只需要 HTML 字符串，可设为 false。",
+        default: true,
+      },
+    },
+    required: ["startUrl"],
+  },
+};
+
+export type ConvertMarxistsBookToolArgs = {
+  startUrl: string;
+  encoding?: string;
+  outputMode?: "summary" | "html";
+  singleFileName?: string;
+  maxPages?: number;
+  saveAsFile?: boolean;
+};
+
+export async function convertMarxistsBookToOfflineHtmlFunc(
+  args: ConvertMarxistsBookToolArgs,
+): Promise<{ rawData: Record<string, unknown>; displayData: string }> {
+  const result = await convertMarxistsBookToOfflineHtml({
+    startUrl: args.startUrl,
+    encoding: args.encoding,
+    maxPages: args.maxPages,
+  });
+
+  const rawData: Record<string, unknown> = {
+    title: result.title,
+    startUrl: result.startUrl,
+    indexUrl: result.indexUrl,
+    stylesheetUrl: result.stylesheetUrl,
+    pages: result.pages,
+    validation: result.validation,
+    fileName: args.singleFileName,
+  };
+  if (args.outputMode === "html") {
+    rawData.html = result.html;
+  }
+
+  return {
+    rawData,
+    displayData: formatMarxistsOfflineBookDisplayData({
+      ...rawData,
+      htmlIncluded: args.outputMode === "html",
+    }),
+  };
+}
+
+export function formatMarxistsOfflineBookDisplayData(data: Record<string, unknown>): string {
+  const validation = (data.validation ?? {}) as any;
+  const pages = Array.isArray(data.pages) ? data.pages : [];
+  return [
+    "✅ 已生成离线 HTML",
+    `书名：${data.title || "未知"}`,
+    `章节数：${validation.pageCount ?? pages.length}`,
+    `大小：${validation.byteLength ?? "未知"} bytes`,
+    `资源内嵌：${validation.hasEmbeddedAssets ? "是" : "否"}`,
+    `残留网络 URL：${validation.hasNetworkUrls ? "是" : "否"}`,
+    data.fileUrl ? `文件：${data.fileUrl}` : undefined,
+    data.htmlIncluded ? "已在 rawData.html 返回完整 HTML。" : undefined,
+  ]
+    .filter(Boolean)
+    .join("\n");
+}

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));
+  }
+}