nolo-cli 0.1.30 → 0.1.31

package/ai/agent/streamAgentChatTurnUtils.ts

@@ -56,6 +56,8 @@ import {
 } from "../tools/toolRunSlice";
 import { buildRecentAppToolMemory } from "./appWorkingMemory";
 import type { AgentRuntimeOptions } from "./types";
+import { getModelConfig, getProviderByModelName, type Provider } from "../llm/providers";
+import type { ImageGenerationState } from "../../chat/messages/types";
 
 const BROWSER_UNAVAILABLE_CORE_TOOLS = new Set([
     "queryModelUsage",
@@ -270,6 +272,103 @@ export const readSafe = async <T>(
 export const joinMapValues = (map: Map<string, string>): string =>
     Array.from(map.values()).join("");
 
+const LARGE_REFERENCE_CONTEXT_CHAR_LIMIT = 50_000;
+const LARGE_REFERENCE_SNIPPET_CHARS = 6_000;
+const LARGE_REFERENCE_MAX_SNIPPETS = 4;
+
+const getPendingFileReferenceKey = (file: PendingFile): string =>
+    file.sourceDialogKey || file.dialogKey || file.pageKey || "";
+
+const normalizeContextText = (value: unknown): string =>
+    String(value ?? "").trim();
+
+const userInputToText = (userInput: string | any[]): string => {
+    if (typeof userInput === "string") return userInput;
+    if (!Array.isArray(userInput)) return "";
+    return userInput
+        .map((part) => {
+            if (typeof part === "string") return part;
+            if (typeof part?.text === "string") return part.text;
+            if (typeof part?.content === "string") return part.content;
+            return "";
+        })
+        .join("\n");
+};
+
+const userRequestsFullReference = (userText: string): boolean =>
+    /全文|完整|全部内容|完整内容|full\s+text|entire\s+(file|document|doc)/i.test(userText);
+
+const extractReferenceSearchTerms = (userText: string): string[] => {
+    const terms = new Set<string>();
+    for (const match of userText.matchAll(/[A-Za-z0-9_./:-]{3,}/g)) {
+        terms.add(match[0].toLowerCase());
+    }
+    for (const match of userText.matchAll(/[\p{Script=Han}]{2,12}/gu)) {
+        const value = match[0];
+        terms.add(value);
+        if (value.length > 4) {
+            for (let index = 0; index <= value.length - 4; index++) {
+                terms.add(value.slice(index, index + 4));
+            }
+        }
+    }
+    return Array.from(terms).slice(0, 20);
+};
+
+const buildRelevantReferenceSnippets = (content: string, userText: string): string => {
+    const terms = extractReferenceSearchTerms(userText);
+    const lowerContent = content.toLowerCase();
+    const ranges: Array<{ start: number; end: number }> = [];
+
+    for (const term of terms) {
+        const needle = /[A-Z]/i.test(term) ? term.toLowerCase() : term;
+        const index = /[A-Z]/i.test(term)
+            ? lowerContent.indexOf(needle)
+            : content.indexOf(needle);
+        if (index < 0) continue;
+        const half = Math.floor(LARGE_REFERENCE_SNIPPET_CHARS / 2);
+        ranges.push({
+            start: Math.max(0, index - half),
+            end: Math.min(content.length, index + term.length + half),
+        });
+        if (ranges.length >= LARGE_REFERENCE_MAX_SNIPPETS) break;
+    }
+
+    if (ranges.length === 0) {
+        ranges.push({
+            start: 0,
+            end: Math.min(content.length, LARGE_REFERENCE_SNIPPET_CHARS),
+        });
+    }
+
+    return ranges
+        .map((range, index) => {
+            const prefix = range.start > 0 ? "...[前文已省略]\n" : "";
+            const suffix = range.end < content.length ? "\n...[后文已省略]" : "";
+            return `### Relevant excerpt ${index + 1}\n${prefix}${content.slice(range.start, range.end)}${suffix}`;
+        })
+        .join("\n\n");
+};
+
+export const formatReferenceContentForCostControl = (
+    dbKey: string,
+    content: string,
+    userText: string,
+): string => {
+    if (content.length <= LARGE_REFERENCE_CONTEXT_CHAR_LIMIT) return content;
+    if (userRequestsFullReference(userText)) {
+        return [
+            `[Large reference cost notice] ${dbKey} is ${content.length} characters. The user explicitly requested full content, so the full text is included despite higher token cost.`,
+            content,
+        ].join("\n\n");
+    }
+
+    return [
+        `[Large reference cost notice] ${dbKey} is ${content.length} characters. To control token cost and keep the model focused, only relevant excerpts are included. If the user asks for the full text explicitly, include the full content next turn.`,
+        buildRelevantReferenceSnippets(content, userText),
+    ].join("\n\n");
+};
+
 /** 检查 OpenAI 消息数组中是否包含 image_url 片段 */
 export const hasImageInMessages = (messages: any[]): boolean => {
     if (!Array.isArray(messages)) return false;
@@ -299,9 +398,12 @@ export const formatCurrentInputContext = (
         return joinMapValues(currentInputMap);
     }
 
+    const seenKeys = new Set<string>();
     const relevantPendingFiles = pendingFiles.filter((file) => {
-        const key = file.sourceDialogKey || file.dialogKey || file.pageKey;
-        return key && currentInputMap.has(key);
+        const key = getPendingFileReferenceKey(file);
+        if (!key || !currentInputMap.has(key) || seenKeys.has(key)) return false;
+        seenKeys.add(key);
+        return true;
     });
 
     if (relevantPendingFiles.length === 0) {
@@ -331,7 +433,7 @@ export const formatCurrentInputContext = (
         output += `--- Source ${sourceCounter}: "${sourceName}" ---\n`;
 
         filesInGroup.forEach((file) => {
-            const key = file.sourceDialogKey || file.dialogKey || file.pageKey;
+            const key = getPendingFileReferenceKey(file);
             if (!key) return; // Skip if no key
             const content = currentInputMap.get(key);
             if (!content) return;
@@ -347,9 +449,90 @@ export const formatCurrentInputContext = (
         sourceCounter++;
     });
 
+    for (const [key, content] of currentInputMap) {
+        if (seenKeys.has(key)) continue;
+        output += `${content}\n`;
+    }
+
     return output;
 };
 
+const formatReferenceSummary = (dbKey: string, refContent: any): string => {
+    const title =
+        typeof refContent?.title === "string" && refContent.title.trim()
+            ? refContent.title.trim()
+            : dbKey;
+    const type =
+        typeof refContent?.type === "string" && refContent.type.trim()
+            ? refContent.type.trim()
+            : "unknown";
+    const updated =
+        refContent?.updatedAt ?? refContent?.updated ?? refContent?.createdAt ?? refContent?.created;
+
+    return [
+        "Previously referenced item:",
+        `DB Key: ${dbKey}`,
+        `Title: ${title}`,
+        `Type: ${type}`,
+        updated ? `Updated At: ${updated}` : "",
+        "Note: full content is not auto-included again to control token cost. Re-attach this item when exact source text is needed.",
+        "---",
+        "",
+    ].filter(Boolean).join("\n");
+};
+
+const fetchReferenceSummaries = async (
+    keys: string[],
+    dispatch: any,
+    preloaded?: Map<string, any>,
+): Promise<Map<string, string>> => {
+    const result = new Map<string, string>();
+    await Promise.all(
+        keys.map(async (dbKey) => {
+            try {
+                const refContent = preloaded?.has(dbKey)
+                    ? preloaded.get(dbKey)
+                    : await dispatch(read({ dbKey })).unwrap();
+                result.set(dbKey, formatReferenceSummary(dbKey, refContent));
+            } catch {
+                result.set(dbKey, formatReferenceSummary(dbKey, null));
+            }
+        }),
+    );
+    return result;
+};
+
+const getReferenceTitle = (refContent: any): string =>
+    typeof refContent?.title === "string" ? refContent.title.trim() : "";
+
+const resolveExplicitHistoryReferenceKeys = async (
+    keys: string[],
+    dispatch: any,
+    userText: string,
+    preloaded?: Map<string, any>,
+): Promise<string[]> => {
+    const text = normalizeContextText(userText);
+    if (!text) return [];
+
+    const matches: string[] = [];
+    await Promise.all(
+        keys.map(async (dbKey) => {
+            try {
+                const refContent = preloaded?.has(dbKey)
+                    ? preloaded.get(dbKey)
+                    : await dispatch(read({ dbKey })).unwrap();
+                const title = getReferenceTitle(refContent);
+                if (text.includes(dbKey) || (title && text.includes(title))) {
+                    matches.push(dbKey);
+                }
+            } catch {
+                if (text.includes(dbKey)) matches.push(dbKey);
+            }
+        }),
+    );
+    return matches;
+};
+
 /** 校验当前用户是否有权限使用该 Agent，并且余额是否充足（每轮调用） */
 export const validateAccessAndBalance = (
     agentConfig: Agent,
@@ -610,6 +793,23 @@ export const buildDynamicContexts = async (
         dialogConfig,
     );
     const finalKeys = deduplicateContextKeys(keySets);
+    const userText = userInputToText(userInput);
+    const explicitHistoryReferenceKeys = await resolveExplicitHistoryReferenceKeys(
+        finalKeys.historyContext,
+        dispatch,
+        userText,
+        referenceContentCache,
+    );
+    const explicitHistoryReferenceKeySet = new Set(explicitHistoryReferenceKeys);
+    const currentInputContextKeys = Array.from(
+        new Set([
+            ...finalKeys.currentInputContext,
+            ...explicitHistoryReferenceKeys,
+        ]),
+    );
+    const historySummaryKeys = finalKeys.historyContext.filter(
+        (key) => !explicitHistoryReferenceKeySet.has(key),
+    );
 
     const fetchReferences = (keys: string[]) =>
         fetchReferenceContents(keys, dispatch, {
@@ -620,14 +820,24 @@ export const buildDynamicContexts = async (
 
     // 只获取动态引用内容
     const [currentInputMap, historyMap] = await Promise.all([
-        fetchReferences(finalKeys.currentInputContext),
-        fetchReferences(finalKeys.historyContext),
+        fetchReferences(currentInputContextKeys),
+        fetchReferenceSummaries(
+            historySummaryKeys,
+            dispatch,
+            referenceContentCache,
+        ),
     ]);
+    const costControlledCurrentInputMap = new Map(
+        Array.from(currentInputMap.entries()).map(([key, content]) => [
+            key,
+            formatReferenceContentForCostControl(key, content, userText),
+        ]),
+    );
 
     const pendingFiles = selectPendingFiles(state);
     const formattedCurrentInputContext = formatCurrentInputContext(
         pendingFiles,
-        currentInputMap,
+        costControlledCurrentInputMap,
     );
 
     const dialogId = dialogConfig?.id ?? null;
@@ -774,9 +984,85 @@ export const applyImageConfigRuntimeOverride = (
 
     return {
         ...agentConfig,
+        ...(override.imageModelOverride
+            ? { model: override.imageModelOverride }
+            : {}),
         imageConfig: {
             ...baseImageConfig,
             ...override,
         },
     };
 };
+
+const formatImageWaitHint = (
+    range?: {
+        min: number;
+        max: number;
+    },
+) => {
+    if (!range || typeof range.min !== "number" || typeof range.max !== "number") {
+        return undefined;
+    }
+    return `通常需要 ${range.min}-${range.max} 秒`;
+};
+
+const resolveAgentImageModelIdentity = (agentConfig: Partial<Agent>) => {
+    let providerKey = (agentConfig.provider || "").toLowerCase();
+    let modelName = agentConfig.model ?? "";
+
+    if (modelName.includes("/")) {
+        const slash = modelName.indexOf("/");
+        if (!providerKey) providerKey = modelName.slice(0, slash);
+        modelName = modelName.slice(slash + 1);
+    }
+
+    try {
+        return {
+            providerKey,
+            modelConfig: getModelConfig(providerKey as Provider, modelName),
+        };
+    } catch {
+        try {
+            const detected = getProviderByModelName(modelName);
+            if (!detected) {
+                return { providerKey, modelConfig: null };
+            }
+            return {
+                providerKey: detected,
+                modelConfig: getModelConfig(detected, modelName),
+            };
+        } catch {
+            return { providerKey, modelConfig: null };
+        }
+    }
+};
+
+export const resolveImageGenerationStreamingState = (
+    agentConfig: Agent,
+    args?: {
+        stage?: ImageGenerationState["stage"];
+        previous?: ImageGenerationState | null;
+    },
+): ImageGenerationState | undefined => {
+    const { modelConfig } = resolveAgentImageModelIdentity(agentConfig);
+    const hasImageOutput =
+        !!(modelConfig?.hasImageOutput ?? (modelConfig as any)?.supportsImageOutput) ||
+        agentConfig.imageConfig?.enabled === true;
+    if (!hasImageOutput) {
+        return undefined;
+    }
+
+    const currentProfile = modelConfig?.imageGenerationProfiles?.find(
+        (profile) => profile.imageModel === modelConfig.name,
+    );
+
+    return {
+        kind: "image_generation",
+        stage: args?.stage ?? args?.previous?.stage ?? "submitted",
+        startedAt: args?.previous?.startedAt ?? Date.now(),
+        waitHint:
+            formatImageWaitHint(modelConfig?.imageGenerationWaitTimeSeconds) ??
+            "通常需要几十秒",
+        profileLabel: currentProfile?.label,
+    };
+};

package/ai/agent/types.ts

@@ -51,6 +51,8 @@ export interface AgentRuntimeOptions {
     imageConfigOverride?: {
         /** 是否在本轮启用图片输出（不写或 true 表示按默认；false 可强制关闭） */
         enabled?: boolean;
+        /** 本轮强制切换到另一个图片模型变体，仅作用于本次调用 */
+        imageModelOverride?: string;
 
         /** 本轮期望的宽高比，不指定则使用上层（Dialog / Agent / 模型）的默认值 */
         aspectRatio?:

package/ai/agent/web/agentDisplayUtils.ts

@@ -0,0 +1,171 @@
+import { format } from "date-fns";
+
+import type { Agent, DialogConfig } from "../../../app/types";
+import { resolveAvatarUrl } from "../../agent/avatarUtils";
+import {
+  type AgentPriceHint,
+  formatModelCostPerMillion,
+} from "../../llm/getPricing";
+
+type AgentCreatorRecord = Pick<
+  Agent,
+  "creatorName" | "originServer" | "userId" | "userName"
+> & {
+  authorAvatar?: unknown;
+  creator?: {
+    avatar?: unknown;
+    avatarFileId?: unknown;
+  };
+  creatorAvatar?: unknown;
+  userAvatar?: unknown;
+};
+
+type CreatorProfileRecord = {
+  avatar?: unknown;
+  avatarFileId?: unknown;
+  avatarUrl?: unknown;
+  name?: unknown;
+  nickname?: unknown;
+  username?: unknown;
+};
+
+export interface AgentDialogHistoryEntry {
+  dbKey: string;
+  spaceId: string | null;
+  spaceName: string | null;
+  title: string;
+  updatedAt: unknown;
+}
+
+export const formatCliProviderLabel = (provider?: string) => {
+  if (provider === "codex") return "OpenAI Codex CLI (codex exec)";
+  if (provider === "gemini") return "Gemini CLI (gemini)";
+  if (provider === "claude") return "Claude CLI (claude)";
+  if (provider === "agy") return "Google Antigravity CLI (agy)";
+  return "GitHub Copilot CLI (gh copilot)";
+};
+
+export const formatRuntimeLocationLabel = (
+  machineId?: string,
+  localLabel = "默认环境"
+) => (machineId ? `远程电脑 (${machineId})` : localLabel);
+
+export const toNonEmptyString = (value: unknown): string | null =>
+  typeof value === "string" && value.trim() ? value.trim() : null;
+
+export const toTimestamp = (value: unknown): number => {
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value === "string") {
+    const parsed = Date.parse(value);
+    return Number.isFinite(parsed) ? parsed : 0;
+  }
+  return 0;
+};
+
+export const formatDateValue = (value: unknown, pattern: string): string => {
+  const timestamp = toTimestamp(value);
+  return timestamp > 0 ? format(new Date(timestamp), pattern) : "--";
+};
+
+export const shouldShowAgentTokenCost = (
+  agent: Pick<Agent, "apiSource" | "inputPrice" | "outputPrice"> | null | undefined,
+  priceHint: AgentPriceHint | null | undefined
+) =>
+  !!agent &&
+  agent.apiSource !== "cli" &&
+  priceHint?.type === "per_turn" &&
+  ((typeof agent.inputPrice === "number" && Number.isFinite(agent.inputPrice)) ||
+    (typeof agent.outputPrice === "number" && Number.isFinite(agent.outputPrice)));
+
+export const formatAgentOutputPrice = (outputPrice?: number) =>
+  outputPrice === 0
+    ? formatModelCostPerMillion(outputPrice)
+    : `1M / ${formatModelCostPerMillion(outputPrice)}`;
+
+export const resolveAgentCreatorSummary = ({
+  item,
+  creatorProfile,
+  server,
+  unknownUserLabel,
+}: {
+  creatorProfile?: CreatorProfileRecord | null;
+  item: AgentCreatorRecord;
+  server?: string | null;
+  unknownUserLabel: string;
+}) => {
+  const name =
+    toNonEmptyString(creatorProfile?.nickname) ||
+    toNonEmptyString(creatorProfile?.name) ||
+    toNonEmptyString(creatorProfile?.username) ||
+    toNonEmptyString(item.userName) ||
+    toNonEmptyString(item.creatorName) ||
+    toNonEmptyString(item.userId) ||
+    unknownUserLabel;
+
+  const creatorAvatarRaw =
+    creatorProfile?.avatarFileId ||
+    creatorProfile?.avatar ||
+    creatorProfile?.avatarUrl ||
+    item.creator?.avatarFileId ||
+    item.creator?.avatar ||
+    item.creatorAvatar ||
+    item.userAvatar ||
+    item.authorAvatar;
+
+  return {
+    avatarUrl: toNonEmptyString(creatorAvatarRaw)
+      ? resolveAvatarUrl(creatorAvatarRaw, item.originServer || server)
+      : null,
+    name,
+  };
+};
+
+export const buildAgentDialogHistory = ({
+  historyAgentKeys,
+  historySpaceNameById,
+  limit = 8,
+  records,
+  untitledDialogLabel,
+}: {
+  historyAgentKeys: ReadonlySet<string>;
+  historySpaceNameById: ReadonlyMap<string, string>;
+  limit?: number;
+  records: readonly unknown[];
+  untitledDialogLabel: string;
+}): AgentDialogHistoryEntry[] =>
+  records
+    .flatMap((record) => {
+      const dialog = record as DialogConfig & {
+        dbKey?: unknown;
+      };
+      const cybots = Array.isArray(dialog.cybots)
+        ? dialog.cybots.filter(
+            (dialogAgentKey): dialogAgentKey is string =>
+              typeof dialogAgentKey === "string" &&
+              dialogAgentKey.trim().length > 0
+          )
+        : [];
+      if (!cybots.some((dialogAgentKey) => historyAgentKeys.has(dialogAgentKey))) {
+        return [];
+      }
+
+      const dbKey = toNonEmptyString(dialog.dbKey);
+      if (!dbKey) return [];
+
+      return [
+        {
+          dbKey,
+          spaceId: toNonEmptyString(dialog.spaceId),
+          title: toNonEmptyString(dialog.title) || untitledDialogLabel,
+          updatedAt: dialog.updatedAt ?? dialog.createdAt,
+        },
+      ];
+    })
+    .sort((left, right) => toTimestamp(right.updatedAt) - toTimestamp(left.updatedAt))
+    .slice(0, limit)
+    .map((dialog) => ({
+      ...dialog,
+      spaceName: dialog.spaceId
+        ? historySpaceNameById.get(dialog.spaceId) ?? dialog.spaceId
+        : null,
+    }));

package/ai/agent/web/useAgentModelAvatarComponent.ts

@@ -0,0 +1,32 @@
+import { useEffect, useState } from "react";
+
+import { getModelAvatarComponent } from "../../llm/modelAvatar";
+
+export const useAgentModelAvatarComponent = ({
+  cliProvider,
+  model,
+  provider,
+}: {
+  cliProvider?: string;
+  model?: string;
+  provider?: string;
+}) => {
+  const [modelAvatarStyle, setModelAvatarStyle] = useState<Awaited<
+    ReturnType<typeof getModelAvatarComponent>
+  > | null>(null);
+
+  useEffect(() => {
+    let cancelled = false;
+    setModelAvatarStyle(null);
+    getModelAvatarComponent(provider, model, cliProvider).then((avatar) => {
+      if (!cancelled) {
+        setModelAvatarStyle(() => avatar);
+      }
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [cliProvider, model, provider]);
+
+  return modelAvatarStyle;
+};

package/ai/ai.locale.ts

@@ -153,6 +153,8 @@ export default {
           "API Key is required when not using Server Proxy, Ollama or Custom provider",
         customUrlRequired:
           "Custom Provider URL is required for the 'custom' provider",
+        machineBindingRequiresCliOrLocalCustom:
+          "Machine binding is only available for CLI agents or custom providers hosted on localhost.",
       },
 
       // Legacy Errors (kept for compatibility)
@@ -444,6 +446,8 @@ export default {
         apiKeyRequired:
           "未使用代理模式、Ollama或自定义服务商时，API密钥为必填项",
         customUrlRequired: "使用自定义服务商时，URL为必填项",
+        machineBindingRequiresCliOrLocalCustom:
+          "只有 CLI Agent 或运行在 localhost 的自定义 Provider 才能绑定机器。",
       },
 
       // 旧版错误（保留以兼容）
@@ -735,6 +739,8 @@ export default {
         apiKeyRequired:
           "未使用代理模式、Ollama或自訂服務提供者時，API金鑰為必填項",
         customUrlRequired: "使用自訂服務提供者時，URL為必填項",
+        machineBindingRequiresCliOrLocalCustom:
+          "只有 CLI Agent 或執行於 localhost 的自訂 Provider 才能綁定電腦。",
       },
 
       // 舊版錯誤（保留以相容）
@@ -991,6 +997,8 @@ export default {
         apiKeyRequired:
           "プロキシモード、Ollama、またはカスタムプロバイダーを使用しない場合、APIキーは必須です",
         customUrlRequired: "カスタムプロバイダーを使用する場合、URLは必須です",
+        machineBindingRequiresCliOrLocalCustom:
+          "マシンバインドを使えるのは CLI Agent か localhost 上のカスタム Provider のみです。",
       },
 
       // レガシーエラー（互換性のため保持）

package/ai/chat/sendOpenAICompletionsRequest.native.ts

@@ -27,6 +27,7 @@ import { accumulateToolCallChunks, AccumulatedToolCall } from "./accumulateToolC
 import { prepareTools } from "../tools/prepareTools";
 
 import { getModelInfo } from "../llm/getModelContextWindow";
+import { supportsImageGeneration } from "../agent/utils/imageOutput";
 
 import type { RootState } from "../../app/store";
 
@@ -62,6 +63,13 @@ type AssistantToolCall = {
     function: { name: string; arguments: string };
 };
 
+const EXPLICIT_IMAGE_TOOL_NAMES = new Set([
+    "openAIGptImage",
+    "openAIGptImageGenerate",
+    "openAIGptImageEdit",
+    "geminiProImagePreview",
+]);
+
 /** 单次流式请求过程中的全部中间状态（显式 state） */
 type StreamState = {
     contentBuffer: MessageContentPart[];
@@ -145,6 +153,13 @@ function buildRequestBodyWithTools(
 
     const rawTools = agentConfig.tools;
     if (!Array.isArray(rawTools) || rawTools.length === 0) return bodyData;
+    const hasExplicitImageTool = rawTools.some(
+        (toolName: unknown) =>
+            typeof toolName === "string" && EXPLICIT_IMAGE_TOOL_NAMES.has(toolName)
+    );
+    if (supportsImageGeneration(agentConfig) && !hasExplicitImageTool) {
+        return bodyData;
+    }
 
     const tools = prepareTools(rawTools, { provider: agentConfig.provider });
     if (!tools.length) return bodyData;