nolo-cli 0.1.22 → 0.1.26

package/ai/taskRun/taskRunProtocol.ts

@@ -156,8 +156,11 @@ export type TaskRunReview = {
 export type TaskRunAutonomy = "manual" | "supervised" | "auto24h";
 
 export type TaskRunBudgetRule = {
+  agentKey?: string;
   provider?: string;
   model?: string;
+  customProviderUrl?: string;
+  apiKeyHeader?: string;
   freeUntil?: string;
   dailyUsdLimit?: number;
   hardStopAfter?: string;
@@ -193,6 +196,7 @@ export type TaskRunControlPolicy = {
   autonomy?: TaskRunAutonomy;
   nextWakeAt?: string;
   pausedReason?: string;
+  runtimeToolPolicy?: Record<string, unknown>;
   budget?: {
     dailyUsdLimit?: number;
     modelBudget?: Record<string, TaskRunBudgetRule>;
@@ -248,20 +252,31 @@ export const DEFAULT_TASK_RUN_CONTROL_POLICY: TaskRunControlPolicy = {
   budget: {
     modelBudget: {
       projectManager: {
+        agentKey: "agent-b2e06f801f-01MIMO25MONTH00000001PGT4X",
         provider: "custom",
-        model: "kimi-k2.5",
-        note: "Default low-cost PM routing.",
+        model: "mimo-v2.5-pro",
+        customProviderUrl: "https://token-plan-cn.xiaomimimo.com/v1",
+        apiKeyHeader: "api-key",
+        freeUntil: "2026-05-31",
+        note: "Default PM and execution routing uses the monthly Mimo custom-key pool; medium intelligence, no marginal cost through the current month.",
       },
       frontend: {
-        model: "kimi-2.6",
-        freeUntil: "2026-05-22",
-        dailyUsdLimit: 1,
-        note: "Frontend implementation should prefer Kimi 2.6 while the free window is active.",
+        agentKey: "agent-b2e06f801f-01MIMO25MONTH00000001PGT4X",
+        provider: "custom",
+        model: "mimo-v2.5-pro",
+        customProviderUrl: "https://token-plan-cn.xiaomimimo.com/v1",
+        apiKeyHeader: "api-key",
+        freeUntil: "2026-05-31",
+        note: "Frontend implementation uses the monthly Mimo custom-key pool by default; escalate to Codex only for quality gates or hard unblocks.",
       },
       mimoCustomKey: {
-        provider: "mimo",
+        agentKey: "agent-b2e06f801f-01MIMO25MONTH00000001PGT4X",
+        provider: "custom",
+        model: "mimo-v2.5-pro",
+        customProviderUrl: "https://token-plan-cn.xiaomimimo.com/v1",
+        apiKeyHeader: "api-key",
         freeUntil: "2026-05-31",
-        note: "Free-use window before normal budget enforcement.",
+        note: "Use the existing monthly Mimo custom-key agent/config for high-token routine implementation, long-context reads, table/doc processing, and low-risk probes.",
       },
     },
   },
@@ -857,11 +872,11 @@ export function recordTaskRunReview(args: {
   meta.review = review;
   let nextMeta = meta;
   const targetWorkItemId = args.targetWorkItemId ?? meta.review?.targetWorkItemId;
-  if (args.status === "needs_changes" && targetWorkItemId) {
+  if ((args.status === "needs_changes" || args.status === "blocked") && targetWorkItemId) {
     nextMeta = updateTaskRunWorkItem({
       meta: nextMeta,
       id: targetWorkItemId,
-      status: "needs_changes",
+      status: args.status,
       artifactRefs: args.artifactIds,
       dialogIds: args.dialogId ? [args.dialogId] : undefined,
       now,

package/ai/token/modelUsageQuery.ts

@@ -64,6 +64,7 @@ export type ModelUsageQueryResult = {
   threshold: {
     costCredits: number | null;
     costUsd: number | null;
+    usedPercent: number | null;
     exceeded: boolean;
   };
 };
@@ -83,6 +84,17 @@ const toNumber = (value: unknown): number =>
 
 const round6 = (value: number): number => Number(value.toFixed(6));
 
+const clampPercent = (value: number): number =>
+  Math.max(0, Math.min(100, Math.round(value)));
+
+const calculateThresholdUsedPercent = (
+  costCredits: number,
+  thresholdCredits: number | null,
+): number | null => {
+  if (thresholdCredits == null || thresholdCredits <= 0) return null;
+  return clampPercent((costCredits / thresholdCredits) * 100);
+};
+
 const normalizeDateKey = (value: unknown): string | null => {
   if (typeof value !== "string" || !value.trim()) return null;
   const trimmed = value.trim();
@@ -227,6 +239,10 @@ export async function queryModelUsage(
       : thresholdCredits == null
         ? null
         : round6(thresholdCredits / creditsPerUsd);
+  const thresholdUsedPercent = calculateThresholdUsedPercent(
+    total.costCredits,
+    thresholdCredits,
+  );
 
   return {
     scope,
@@ -246,6 +262,7 @@ export async function queryModelUsage(
     threshold: {
       costCredits: thresholdCredits,
       costUsd: thresholdUsd,
+      usedPercent: thresholdUsedPercent,
       exceeded: thresholdCredits == null ? false : total.costCredits > thresholdCredits,
     },
   };

package/ai/tools/agent/agentTools.ts

@@ -8,6 +8,10 @@ import {
     createAgentToolFunctionSchema,
     createAgentToolFunc,
 } from "./createAgentTool";
+import {
+    prepareAgentDraftToolFunctionSchema,
+    prepareAgentDraftToolFunc,
+} from "./prepareAgentDraftTool";
 import {
     createSkillAgentToolFunctionSchema,
     createSkillAgentToolFunc,
@@ -28,6 +32,10 @@ import {
     streamParallelAgentsFunctionSchema,
     streamParallelAgentsFunc,
 } from "./streamParallelAgentsTool";
+import {
+    startAgentDialogFunctionSchema,
+    startAgentDialogFunc,
+} from "./startAgentDialogTool";
 import {
     createDialogFunctionSchema,
     createDialogFunc,
@@ -44,6 +52,23 @@ import {
 import type { ToolDefinition } from "../index";
 
 export const agentToolDefinitions: ToolDefinition[] = [
+    {
+        id: "prepareAgentDraft",
+        schema: prepareAgentDraftToolFunctionSchema,
+        executor: prepareAgentDraftToolFunc,
+        description: {
+            name: "prepareAgentDraft",
+            description:
+                "整理 Agent 创建草稿并交给用户预览确认，不创建真实 Agent。",
+            category: "计划与编排",
+        },
+        behavior: "data",
+        uiGroup: "agent",
+        capability: "general",
+        riskLevel: "low",
+        costLevel: "low",
+        defaultConsent: "auto",
+    },
     {
         id: "createAgent",
         schema: createAgentToolFunctionSchema,
@@ -151,6 +176,19 @@ export const agentToolDefinitions: ToolDefinition[] = [
         behavior: "orchestrator",
         uiGroup: "agent",
     },
+    {
+        id: "startAgentDialog",
+        schema: startAgentDialogFunctionSchema,
+        executor: startAgentDialogFunc,
+        description: {
+            name: "startAgentDialog",
+            description:
+                "启动一个子 Agent dialog，返回 childDialogId，供调用方后续查询、接管或投影状态。",
+            category: "计划与编排",
+        },
+        behavior: "orchestrator",
+        uiGroup: "agent",
+    },
     {
         id: "createDialog",
         schema: createDialogFunctionSchema,

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/agent/startAgentDialogTool.ts

@@ -0,0 +1,53 @@
+export const startAgentDialogFunctionSchema = {
+  name: "startAgentDialog",
+  description:
+    "启动一个子 Agent dialog 并立即返回 childDialogId。用于通用 agent 派发/交接，不等待子 Agent 完成，也不替调用方决定任务状态。",
+  parameters: {
+    type: "object",
+    properties: {
+      targetAgentKey: {
+        type: "string",
+        description: "要启动的目标 Agent key。",
+      },
+      message: {
+        type: "string",
+        description: "发送给目标 Agent 的自然语言任务或上下文。",
+      },
+      parentDialogId: {
+        type: "string",
+        description: "可选。父 dialogId；未提供时使用当前 dialogId。",
+      },
+      subjectRefs: {
+        type: "array",
+        description: "可选。与本次子 dialog 相关的业务对象引用，保持行业中立。",
+        items: {
+          type: "object",
+          properties: {
+            kind: { type: "string" },
+            id: { type: "string" },
+            role: { type: "string" },
+          },
+          required: ["kind", "id"],
+        },
+      },
+      idempotencyKey: {
+        type: "string",
+        description: "可选。调用方用于去重的稳定 key；当前版本仅透传给运行上下文。",
+      },
+      serverBase: {
+        type: "string",
+        description:
+          "可选。目标 Agent 所在的 nolo server origin；跨域目标必须由服务端 AGENT_TOOL_ALLOWED_SERVER_BASES 放行。",
+      },
+      timeoutMs: {
+        type: "number",
+        description: "可选。子 Agent background run 的执行超时预算（毫秒）。",
+      },
+    },
+    required: ["targetAgentKey", "message"],
+  },
+};
+
+export async function startAgentDialogFunc(): Promise<never> {
+  throw new Error("startAgentDialog is a server-side agent tool. Use it through /api/agent/run.");
+}

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