nolo-cli 0.1.30 → 0.1.32

package/ai/agent/executeToolCall.ts

@@ -1,59 +0,0 @@
-// packages/ai/agent/executeToolCall.ts
-//
-// 提取自 runAgentClientLoop：非流式多轮循环中执行单次 tool_call 的公共逻辑。
-// streamAgentChatTurn 走 sendOpenAICompletionsRequest → toolThunks，不使用此函数。
-
-import { findToolExecutor } from "../tools";
-import { getToolResultErrorData } from "../tools/toolResultError";
-
-interface ToolCall {
-  id: string;
-  function?: {
-    name?: string;
-    arguments?: string;
-  };
-}
-
-/**
- * 执行单次 tool_call，返回工具结果字符串（供追加到 messages）。
- *
- * @param tc            LLM 返回的单个 tool_call 对象
- * @param thunkApi      Redux thunkApi（含 dispatch / getState）
- * @param parentMessageId 父消息 ID（关联上下文）
- */
-export async function executeToolCall(
-  tc: ToolCall,
-  thunkApi: any,
-  context?: { parentMessageId?: string; agentKey?: string }
-): Promise<string> {
-  const toolName: string = tc.function?.name ?? "";
-  const toolArgs = (() => {
-    try {
-      return JSON.parse(tc.function?.arguments ?? "{}");
-    } catch {
-      return {};
-    }
-  })();
-
-  try {
-    const executor = findToolExecutor(toolName);
-    if (!executor) {
-      return `[工具 "${toolName}" 未找到]`;
-    }
-    const result = await executor(toolArgs, thunkApi, {
-      parentMessageId: context?.parentMessageId ?? "",
-      agentKey: context?.agentKey,
-    });
-    // executor 返回 { rawData, displayData? } 或直接返回字符串
-    const raw = result?.rawData ?? result;
-    return typeof raw === "string" ? raw : JSON.stringify(raw);
-  } catch (err: any) {
-    console.error(`[executeToolCall] tool "${toolName}" 执行失败:`, err);
-    const structured = getToolResultErrorData(err);
-    if (structured?.rawData !== undefined) {
-      const raw = structured.rawData;
-      return typeof raw === "string" ? raw : JSON.stringify(raw);
-    }
-    return `[工具 "${toolName}" 执行失败: ${err?.message ?? err}]`;
-  }
-}

package/ai/agent/fetchAgentContexts.ts

@@ -1,42 +0,0 @@
-import { fetchReferenceContents } from "../context/buildReferenceContext";
-import { resolveReferenceAssets } from "../agent/referenceUtils";
-import type { ReferenceItem } from "../../app/types";
-
-export interface AgentContexts {
-  botInstructionsContext: string;
-  botKnowledgeContext: string;
-}
-
-/** 根据 agentConfig.references 拉取 instruction / knowledge */
-export async function fetchAgentContexts(
-  references: ReferenceItem[] | undefined,
-  dispatch: any
-): Promise<AgentContexts> {
-  if (!Array.isArray(references)) {
-    return { botInstructionsContext: "", botKnowledgeContext: "" };
-  }
-
-  const { references: normalizedRefs, contentByKey } =
-    await resolveReferenceAssets(references, dispatch);
-
-  const instructionKeys = new Set<string>();
-  const knowledgeKeys = new Set<string>();
-  normalizedRefs.forEach((ref) => {
-    if (!ref.dbKey) return;
-    ref.type === "instruction"
-      ? instructionKeys.add(ref.dbKey)
-      : knowledgeKeys.add(ref.dbKey);
-  });
-  const [instructionsMap, knowledgeMap] = await Promise.all([
-    fetchReferenceContents(Array.from(instructionKeys), dispatch, {
-      preloaded: contentByKey,
-    }),
-    fetchReferenceContents(Array.from(knowledgeKeys), dispatch, {
-      preloaded: contentByKey,
-    }),
-  ]);
-  return {
-    botInstructionsContext: Array.from(instructionsMap.values()).join(""),
-    botKnowledgeContext: Array.from(knowledgeMap.values()).join(""),
-  };
-}

package/ai/agent/generatePrompt.ts

@@ -1,3 +0,0 @@
-// 文件路径: ai/agent/generatePrompt.ts
-// 向后兼容转发层，请使用 buildSystemPrompt
-export { buildSystemPrompt as generatePrompt, buildSystemPrompt } from "./buildSystemPrompt";

package/ai/agent/getFullChatContextKeys.ts

@@ -1,168 +0,0 @@
-
-// packages/ai/agent/getFullChatContextKeys.ts
-import { RootState } from "../../app/store";
-import { selectAllMsgs } from "../../chat/messages/messageSlice";
-import type { DialogConfig } from "../../app/types";
-import { extractCustomId } from "../../core/prefix";
-
-/** 简单的数组差集工具：返回 arrA 中不在 arrB 里的元素 */
-const difference = <T>(arrA: T[], arrB: T[]): T[] => {
-  if (!arrA.length) return [];
-  if (!arrB.length) return [...arrA];
-
-  const exclude = new Set(arrB);
-  return arrA.filter((item) => !exclude.has(item));
-};
-
-/**
- * Collect all possible reference keys for this chat turn:
- * - botInstructionKeys: keys from agentConfig.references of type "instruction"
- * - botKnowledgeKeys: keys from agentConfig.references (non-instruction)
- * - currentInputKeys: keys referenced directly by the user's current input (array parts with pageKey)
- * - historyKeys: keys from all previous messages' content parts
- */
-export const getFullChatContextKeys = async (
-  state: RootState,
-  dispatch: any,
-  agentConfig: any,
-  userInput: string | any[],
-  dialogConfig?: DialogConfig
-): Promise<Record<string, Set<string>>> => {
-  const msgs = selectAllMsgs(
-    state,
-    dialogConfig?.dbKey
-      ? extractCustomId(dialogConfig.dbKey)
-      : dialogConfig?.id
-  );
-
-  const botInstructionKeys = new Set<string>();
-  const botKnowledgeKeys = new Set<string>();
-
-  if (Array.isArray(agentConfig.references)) {
-    for (const ref of agentConfig.references as Array<{
-      dbKey: string;
-      type: string;
-    }>) {
-      if (!ref?.dbKey) continue;
-      if (ref.type === "instruction") {
-        botInstructionKeys.add(ref.dbKey);
-      } else {
-        botKnowledgeKeys.add(ref.dbKey);
-      }
-    }
-  }
-
-  const currentInputKeys = new Set<string>();
-  if (Array.isArray(userInput)) {
-    for (const part of userInput) {
-      if (part?.pageKey) currentInputKeys.add(part.pageKey);
-      if (part?.dialogKey) currentInputKeys.add(part.dialogKey);
-    }
-  }
-
-  const historyKeys = new Set<string>();
-
-  // 1. 从 DialogConfig.referenceKeys 读取（这是主要的、持久化的引用来源）
-  // 即使消息被压缩，这里的 keys 也会保留
-  const savedKeys = dialogConfig?.referenceKeys;
-  if (Array.isArray(savedKeys)) {
-    savedKeys.forEach((k: string) => historyKeys.add(k));
-  }
-
-  // 2. 仅扫描尚未被压缩的近期消息
-  // 已压缩的消息（summarizedBeforeId 之前的部分，包含该条本身）的 keys
-  // 已在压缩时存入 dialogConfig.referenceKeys，步骤 1 已覆盖，无需重复扫描。
-  const scanContentParts = (msg: any) => {
-    if (!msg.content) return;
-    const contentParts = Array.isArray(msg.content) ? msg.content : [msg.content];
-    for (const part of contentParts) {
-      if (part && typeof part === 'object') {
-        if (part?.pageKey) historyKeys.add(part.pageKey);
-        if (part?.dialogKey) historyKeys.add(part.dialogKey);
-      }
-    }
-  };
-
-  if (msgs && msgs.length > 0) {
-    const summarizedBeforeId = dialogConfig?.summarizedBeforeId;
-
-    if (!summarizedBeforeId) {
-      // 无压缩记录，扫描全部消息
-      for (const msg of (msgs as any[])) scanContentParts(msg);
-    } else {
-      let foundMarker = false;
-      let startScan = false;
-
-      for (const msg of (msgs as any[])) {
-        if (!startScan) {
-          if (msg.id === summarizedBeforeId) {
-            foundMarker = true;
-            startScan = true;
-            // summarizedBeforeId 那条消息本身已被压缩，keys 在 referenceKeys 里，跳过
-          }
-          continue;
-        }
-        scanContentParts(msg);
-      }
-
-      // marker 找不到说明 Redux 中的消息都是新的，应该全扫
-      if (!foundMarker) {
-        console.warn(`[getFullChatContextKeys] marker ${summarizedBeforeId} not found, scanning all`);
-        for (const msg of (msgs as any[])) scanContentParts(msg);
-      }
-    }
-  }
-
-  return {
-    botInstructionKeys,
-    currentInputKeys,
-    historyKeys,
-    botKnowledgeKeys,
-  };
-};
-
-/**
- * Deduplicate keys across priority levels.
- * Priority order (high -> low):
- * 1) botInstructionKeys
- * 2) currentInputKeys
- * 3) historyKeys
- * 4) botKnowledgeKeys
- *
- * Return field names match context block identifiers expected downstream.
- */
-export const deduplicateContextKeys = (
-  keys: Record<string, Set<string>>
-): Record<string, string[]> => {
-  const {
-    botInstructionKeys,
-    currentInputKeys,
-    historyKeys,
-    botKnowledgeKeys,
-  } = keys;
-
-  const finalBotInstructionKeys = Array.from(botInstructionKeys);
-
-  const finalCurrentInputKeys = difference(
-    Array.from(currentInputKeys),
-    finalBotInstructionKeys
-  );
-
-  const finalHistoryKeys = difference(Array.from(historyKeys), [
-    ...finalBotInstructionKeys,
-    ...finalCurrentInputKeys,
-  ]);
-
-  const finalBotKnowledgeKeys = difference(Array.from(botKnowledgeKeys), [
-    ...finalBotInstructionKeys,
-    ...finalCurrentInputKeys,
-    ...finalHistoryKeys,
-  ]);
-
-  return {
-    botInstructionsContext: finalBotInstructionKeys,
-    currentInputContext: finalCurrentInputKeys,
-    historyContext: finalHistoryKeys,
-    botKnowledgeContext: finalBotKnowledgeKeys,
-  };
-};

package/ai/agent/guidedCreation/assistant.ts

@@ -1,82 +0,0 @@
-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

@@ -1,84 +0,0 @@
-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

@@ -1,62 +0,0 @@
-import type { FormData as AgentFormData } from "../../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

@@ -1,38 +0,0 @@
-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/hooks/fetchPublicAgents.ts

@@ -1,133 +0,0 @@
-import { getDb } from "../../../database/client/db";
-import { pino } from "pino";
-import { pubAgentKeys } from "../../../database/keys";
-import { Agent } from "../../../app/types";
-import { supportsImageGeneration } from "../../agent/utils/imageOutput";
-import { getRecordTimestamp, isTombstoneRecord } from "../../../database/tombstones";
-import { buildSortMeta, sortAgents } from "../../agent/utils/sortUtils";
-
-const logger = pino({ name: "fetchPublicAgents" });
-
-interface FetchPublicAgentsOptions {
-  limit?: number;
-  sortBy?:
-  | "recommended"
-  | "newest"
-  | "popular"
-  | "rating"
-  | "outputPriceAsc"
-  | "outputPriceDesc"
-  | "favorite";
-  searchName?: string;
-  userId?: string;
-  imageOutputOnly?: boolean;
-  toolName?: string;
-}
-
-interface PublicAgentTombstone {
-  id?: string;
-  dbKey?: string;
-  deletedAt?: string | number;
-  updatedAt?: string | number;
-  createdAt?: string | number;
-}
-
-export interface FetchPublicAgentsResult {
-  data: Agent[];
-  total: number;
-  hasMore: boolean;
-  tombstones: PublicAgentTombstone[];
-}
-
-export async function fetchPublicAgents(
-  options: FetchPublicAgentsOptions = {}
-): Promise<FetchPublicAgentsResult> {
-  const {
-    limit = 20,
-    sortBy = "recommended",
-    searchName,
-    userId,
-    imageOutputOnly = false,
-    toolName,
-  } = options;
-
-  try {
-    const ranges = pubAgentKeys.allPublicRanges();
-    let results: Agent[] = [];
-    let tombstones: PublicAgentTombstone[] = [];
-
-    const db = getDb();
-    if (!db) return { data: [], total: 0, hasMore: false };
-
-    for (const { start, end } of ranges) {
-      const iterator = await db.iterator({
-        gte: start,
-        lte: end,
-      });
-      for await (const [, value] of iterator) {
-        if (!value?.isPublic) continue;
-        if (isTombstoneRecord(value)) {
-          tombstones.push(value as PublicAgentTombstone);
-          continue;
-        }
-        results.push(value as Agent);
-      }
-    }
-
-    if (searchName) {
-      const kw = searchName.toLowerCase();
-      results = results.filter((agent) =>
-        agent.name?.toLowerCase().includes(kw)
-      );
-    }
-
-    if (userId) {
-      results = results.filter((agent) => agent.userId === userId);
-    }
-
-    if (imageOutputOnly) {
-      results = results.filter((agent) => supportsImageGeneration(agent));
-    }
-
-    if (toolName) {
-      const kw = toolName.toLowerCase();
-      results = results.filter((agent) =>
-        agent.tools?.some((t) => t.toLowerCase().includes(kw))
-      );
-    }
-
-    results = sortAgents(
-      results.map((agent) => ({
-        ...(agent as any),
-        __sort: buildSortMeta(agent),
-      })),
-      sortBy
-    );
-
-    const paginatedResults = results.slice(0, limit);
-
-    logger.debug(
-      {
-        total: results.length,
-        returned: paginatedResults.length,
-        sortBy,
-        limit,
-        imageOutputOnly,
-        firstItemCreatedAt: paginatedResults[0]?.createdAt,
-      },
-      "Fetched public agents (local)"
-    );
-
-    return {
-      data: paginatedResults,
-      total: results.length,
-      hasMore: limit < results.length,
-      tombstones: tombstones.sort(
-        (left, right) => getRecordTimestamp(right) - getRecordTimestamp(left)
-      ),
-    };
-  } catch (error) {
-    logger.error({ error }, "Failed to fetch public agents (local)");
-    throw error;
-  }
-}