nolo-cli 0.1.22 → 0.1.26

package/ai/agent/guidedCreation/assistant.ts

@@ -0,0 +1,82 @@
+import type { GuidedAgentDraft, GuidedAgentReferenceChoice } from "./types";
+
+export const GUIDED_AGENT_CREATION_ASSISTANT_SYSTEM_PROMPT = `你是 Nolo 的 AI 创建助手。
+
+目标：通过对话理解用户想创建的 AI，并输出结构化配置草稿。
+
+规则：
+- 只生成草稿，不要创建真实 Agent 记录。
+- 不要告诉用户你已经创建了 Agent。
+- 优先询问用途、目标用户、风格、边界、能力、资料来源、公开状态。
+- 默认用能力语言沟通，不要要求用户理解 tool id。
+- 如果用户提到资料、知识库或当前空间，只推荐 references，必须等待用户确认后才选择。
+- 输出给系统的结构化草稿必须放在最后一个 JSON 代码块中。
+- JSON 形状必须是 {"draft": {...}}。
+- draft 字段包括 name, introduction, prompt, promptSummary, provider, model, isPublic, capabilityIds, toolIds, references, tags, unresolved。
+- 如果信息不足，把缺失项写进 unresolved，并继续追问。
+`;
+
+const extractJsonBlocks = (content: string): string[] => {
+  const blocks: string[] = [];
+  const pattern = /```json\s*([\s\S]*?)```/g;
+  let match: RegExpExecArray | null;
+  while ((match = pattern.exec(content)) != null) {
+    blocks.push(match[1].trim());
+  }
+  return blocks;
+};
+
+export const parseGuidedAgentAssistantDraft = (
+  content: string
+): GuidedAgentDraft | null => {
+  const blocks = extractJsonBlocks(content);
+  const last = blocks[blocks.length - 1];
+  if (!last) return null;
+
+  try {
+    const parsed = JSON.parse(last);
+    const draft = parsed?.draft;
+    if (!draft || typeof draft !== "object") return null;
+
+    const sanitizeStringArray = (value: unknown): string[] =>
+      Array.isArray(value)
+        ? value.filter((x): x is string => typeof x === "string")
+        : [];
+
+    const rawRefs = Array.isArray(draft.references) ? draft.references : [];
+    const sanitizedReferences: GuidedAgentReferenceChoice[] = rawRefs
+      .filter((ref): ref is Record<string, unknown> =>
+        ref !== null && typeof ref === "object"
+      )
+      .filter((r) => typeof r.dbKey === "string")
+      .map((r) => {
+        const choice: GuidedAgentReferenceChoice = {
+          dbKey: r.dbKey,
+          title: typeof r.title === "string" ? r.title : "",
+          type: r.type === "instruction" ? "instruction" : "knowledge",
+          selected: r.selected === true,
+        };
+        if (typeof r.reason === "string") {
+          choice.reason = r.reason;
+        }
+        return choice;
+      });
+
+    return {
+      name: String(draft.name || ""),
+      introduction: String(draft.introduction || ""),
+      prompt: String(draft.prompt || ""),
+      promptSummary: String(draft.promptSummary || ""),
+      provider: String(draft.provider || ""),
+      model: String(draft.model || ""),
+      isPublic: draft.isPublic === true,
+      capabilityIds: sanitizeStringArray(draft.capabilityIds),
+      toolIds: sanitizeStringArray(draft.toolIds),
+      references: sanitizedReferences,
+      tags: sanitizeStringArray(draft.tags),
+      unresolved: sanitizeStringArray(draft.unresolved),
+    };
+  } catch {
+    return null;
+  }
+};

package/ai/agent/guidedCreation/capabilities.ts

@@ -0,0 +1,84 @@
+import type { GuidedAgentCapabilityId } from "./types";
+
+type CapabilityDefinition = {
+  id: GuidedAgentCapabilityId;
+  label: {
+    zhCN: string;
+    en: string;
+  };
+  description: {
+    zhCN: string;
+    en: string;
+  };
+  toolIds: string[];
+};
+
+export const GUIDED_AGENT_CAPABILITIES: Record<
+  GuidedAgentCapabilityId,
+  CapabilityDefinition
+> = {
+  webSearch: {
+    id: "webSearch",
+    label: { zhCN: "联网搜索", en: "Search the web" },
+    description: {
+      zhCN: "需要获取外部网页、资料或最新信息时使用。",
+      en: "Use when the agent needs external webpages, research, or current information.",
+    },
+    toolIds: ["exa_search", "fetchWebpage"],
+  },
+  docs: {
+    id: "docs",
+    label: { zhCN: "读写文档", en: "Read and write docs" },
+    description: {
+      zhCN: "需要读取、创建或更新知识页和文档时使用。",
+      en: "Use when the agent should read, create, or update docs.",
+    },
+    toolIds: ["createDoc", "updateDoc", "read"],
+  },
+  tables: {
+    id: "tables",
+    label: { zhCN: "处理表格", en: "Work with tables" },
+    description: {
+      zhCN: "需要创建表、追加记录或整理结构化数据时使用。",
+      en: "Use when the agent should create tables or manage structured rows.",
+    },
+    toolIds: ["createTable", "addTableRow", "addTableRows", "read"],
+  },
+  agents: {
+    id: "agents",
+    label: { zhCN: "调用其他 AI", en: "Call other AI agents" },
+    description: {
+      zhCN: "需要多 Agent 协作、评审或分工时使用。",
+      en: "Use when the agent should collaborate with other agents.",
+    },
+    toolIds: ["callAgent", "startAgentDialog"],
+  },
+  apps: {
+    id: "apps",
+    label: { zhCN: "创建应用或代码", en: "Create apps or code" },
+    description: {
+      zhCN: "需要生成应用、代码或使用 App Builder 能力时使用。",
+      en: "Use when the agent should build apps, code, or App Builder outputs.",
+    },
+    toolIds: ["appDeploy", "appList", "appRead"],
+  },
+};
+
+export const mapCapabilityIdsToToolIds = (
+  capabilityIds: GuidedAgentCapabilityId[]
+): string[] => {
+  const seen = new Set<string>();
+  const result: string[] = [];
+
+  for (const id of capabilityIds) {
+    const definition = GUIDED_AGENT_CAPABILITIES[id];
+    if (!definition) continue;
+    for (const toolId of definition.toolIds) {
+      if (seen.has(toolId)) continue;
+      seen.add(toolId);
+      result.push(toolId);
+    }
+  }
+
+  return result;
+};

package/ai/agent/guidedCreation/draft.ts

@@ -0,0 +1,62 @@
+import type { FormData as AgentFormData } from "ai/agent/createAgentSchema";
+import type { GuidedAgentDraft, GuidedAgentValidationResult } from "./types";
+
+const trim = (value: unknown) =>
+  typeof value === "string" ? value.trim() : "";
+
+export const validateGuidedAgentDraft = (
+  draft: GuidedAgentDraft
+): GuidedAgentValidationResult => {
+  const missing: string[] = [];
+
+  if (!trim(draft.name)) missing.push("name");
+  if (!trim(draft.model)) missing.push("model");
+  if (!trim(draft.provider)) missing.push("provider");
+  if (!trim(draft.prompt)) missing.push("prompt");
+  if (!trim(draft.introduction)) missing.push("introduction");
+
+  return missing.length === 0 ? { ok: true } : { ok: false, missing };
+};
+
+export const mergeGuidedAgentDraft = (
+  current: GuidedAgentDraft,
+  next: Partial<GuidedAgentDraft>
+): GuidedAgentDraft => ({
+  ...current,
+  ...next,
+  capabilityIds: next.capabilityIds ?? current.capabilityIds,
+  toolIds: next.toolIds ?? current.toolIds,
+  references: next.references ?? current.references,
+  tags: next.tags ?? current.tags,
+  unresolved: next.unresolved ?? current.unresolved,
+});
+
+export const buildAgentFormDataFromGuidedDraft = (
+  draft: GuidedAgentDraft
+): AgentFormData => ({
+  name: trim(draft.name),
+  model: trim(draft.model),
+  provider: trim(draft.provider),
+  apiSource: "platform",
+  useServerProxy: true,
+  hasVision: false,
+  prompt: trim(draft.prompt),
+  introduction: trim(draft.introduction),
+  greeting: `你好，我是${trim(draft.name) || "你的 AI 助手"}。你想先让我帮你做什么？`,
+  isPublic: draft.isPublic === true,
+  tags: draft.tags.map((tag) => trim(tag)).filter(Boolean).join(", "),
+  tools: Array.from(new Set(draft.toolIds.filter(Boolean))),
+  references: draft.references
+    .filter((reference) => reference.selected === true)
+    .map((reference) => ({
+      dbKey: reference.dbKey,
+      title: reference.title || "",
+      type: reference.type === "instruction" ? "instruction" : "knowledge",
+    })),
+  linkedSpaces: [],
+  customProviderUrl: "",
+  apiKey: "",
+  inputPrice: 0,
+  outputPrice: 0,
+  whitelist: [],
+});

package/ai/agent/guidedCreation/types.ts

@@ -0,0 +1,38 @@
+import type { ReferenceItem } from "app/types";
+
+export type GuidedAgentCapabilityId =
+  | "webSearch"
+  | "docs"
+  | "tables"
+  | "agents"
+  | "apps";
+
+export type GuidedAgentReferenceChoice = ReferenceItem & {
+  selected: boolean;
+  reason?: string;
+};
+
+export type GuidedAgentDraft = {
+  name: string;
+  introduction: string;
+  prompt: string;
+  promptSummary: string;
+  provider: string;
+  model: string;
+  isPublic: boolean;
+  capabilityIds: GuidedAgentCapabilityId[];
+  toolIds: string[];
+  references: GuidedAgentReferenceChoice[];
+  tags: string[];
+  unresolved: string[];
+};
+
+export type GuidedAgentAssistantMessage = {
+  id: string;
+  role: "user" | "assistant";
+  content: string;
+};
+
+export type GuidedAgentValidationResult =
+  | { ok: true }
+  | { ok: false; missing: string[] };

package/ai/agent/machineRunPermissions.ts

@@ -65,13 +65,31 @@ export function resolveMachineRunPermissionPolicy(agentConfig: any): MachineRunP
 }
 
 const WRITE_INTENT_RE =
-  /\b(write|overwrite|edit|modify|delete|remove|rename|move|create|save|patch|apply patch|mkdir|touch|rm|rmdir|del|erase|copy-item|move-item|remove-item|set-content|add-content|new-item)\b|[\u5199\u5220\u6539\u4FEE\u4FDD\u5B58\u521B\u5EFA\u79FB\u52A8]/i;
+  /\b(write|overwrite|edit|modify|delete|remove|rename|move|create|save|patch|apply patch|mkdir|touch|rm|rmdir|del|erase|copy-item|move-item|remove-item|set-content|add-content|new-item)\b|(\u5199\u5165|\u5199\u6587\u4EF6|\u5220\u9664|\u79FB\u9664|\u91CD\u547D\u540D|\u79FB\u52A8|\u521B\u5EFA|\u65B0\u5EFA|\u4FDD\u5B58|\u4FEE\u6539|\u7F16\u8F91|\u6253\u8865\u4E01|\u5E94\u7528\u8865\u4E01)/i;
 
 const SHELL_INTENT_RE =
-  /\b(run|execute|exec|shell|terminal|powershell|pwsh|bash|zsh|cmd\.exe|npm|bun|node|python|git|curl|wget|ssh|scp|chmod|chown|sudo)\b|[\u8FD0\u884C\u6267\u884C\u547D\u4EE4\u7EC8\u7AEF]/i;
+  /\b(run|execute|exec)\s+(?:a\s+)?(?:shell|command|terminal|powershell|pwsh|bash|zsh|cmd\.exe|npm|bun|node|python|git|curl|wget|ssh|scp|chmod|chown|sudo|tests?|test suite)\b|\b(open|start)\s+(?:a\s+)?(?:shell|terminal)\b|\b(powershell|pwsh|bash|zsh|cmd\.exe|ssh|sudo)\b|(\u8FD0\u884C\u547D\u4EE4|\u6267\u884C\u547D\u4EE4|\u547D\u4EE4\u884C|\u7EC8\u7AEF|\u63A7\u5236\u53F0)/i;
+
+const NEGATION_RE =
+  /\b(do not|don't|dont|never|no need to|without|非目标|不要|不需要|禁止|无需)\b|[\u4E0D\u975E]/i;
+
+function stripNegatedPolicySentences(task: string): string {
+  return task
+    .split(/([\n.;!?。；！？])/)
+    .reduce<string[]>((segments, part, index, parts) => {
+      if (index % 2 === 1) return segments;
+      const separator = parts[index + 1] ?? "";
+      const segment = `${part}${separator}`;
+      const mentionsRestrictedAction = WRITE_INTENT_RE.test(segment) || SHELL_INTENT_RE.test(segment);
+      if (mentionsRestrictedAction && NEGATION_RE.test(segment)) return segments;
+      segments.push(segment);
+      return segments;
+    }, [])
+    .join("");
+}
 
 export function assertMachineRunAllowed(userInput: string, policy: MachineRunPermissionPolicy) {
-  const task = String(userInput || "");
+  const task = stripNegatedPolicySentences(String(userInput || ""));
   if (!policy.allowFilesystemWrite && WRITE_INTENT_RE.test(task)) {
     throw new Error(WRITE_DENIED);
   }

package/ai/agent/runtimeGuidance.ts

@@ -54,7 +54,7 @@ const buildWebResearchToolPolicyBlock = (
   return [
     "--- 生产环境网页研究工具策略 ---",
     "生产环境网页研究优先使用 fetchWebpage、站点 Markdown / llms.txt、或专用浏览/搜索工具。",
-    "不要用 execShell/execBash 调 curl、grep、sed 等命令抓网页或截取网页段落；生产环境通常会禁用 dev shell，反复尝试只会浪费回合。",
+    "不要用 execShell 调 curl、grep、sed 等命令抓网页或截取网页段落；生产环境通常会禁用 dev shell，反复尝试只会浪费回合。",
     "如果网页内容过长或锚点段落没有被单独提取，先寻找该文档站提供的 Markdown 版本、独立页面、llms.txt 索引或更具体 URL，再继续回答。",
   ].join("\n");
 };

package/ai/agent/server/fetchPublicAgents.ts

@@ -150,7 +150,12 @@ export async function fetchPublicAgents(
 
   if (searchName) {
     const kw = searchName.toLowerCase();
-    list = list.filter((agent) => agent.name?.toLowerCase().includes(kw));
+    list = list.filter((agent) => {
+      const nameMatch = agent.name?.toLowerCase().includes(kw);
+      const introMatch = agent.introduction?.toLowerCase().includes(kw);
+      const tagMatch = agent.tags?.some((tag) => tag.toLowerCase().includes(kw));
+      return nameMatch || introMatch || tagMatch;
+    });
   }
 
   if (userId) {