shipmyagent 1.0.135 → 1.0.148

package/README.md

@@ -16,14 +16,14 @@ shipmyagent .
 
 ### zsh: permission denied: shipmyagent
 
-这不是 `sudo` / 系统管理员权限问题，通常是因为 `pnpm` 的 `.bin/shipmyagent` 可能是软链到实际入口文件（例如 `.../shipmyagent/bin/cli.js`），而目标文件缺少可执行位（`+x`）。
+这不是 `sudo` / 系统管理员权限问题，通常是因为 `pnpm` 的 `.bin/shipmyagent` 可能是软链到实际入口文件（例如 `.../shipmyagent/bin/process/commands/index.js`），而目标文件缺少可执行位（`+x`）。
 
 ```bash
 # 本地依赖安装（仓库内）
-chmod +x node_modules/shipmyagent/bin/cli.js
+chmod +x node_modules/shipmyagent/bin/process/commands/index.js
 
 # 或者直接用 node 执行（不依赖可执行位）
-node node_modules/shipmyagent/bin/cli.js .
+node node_modules/shipmyagent/bin/process/commands/index.js .
 ```
 
 ## access

package/bin/core/context/AgentRunner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AgentRunner.d.ts","sourceRoot":"","sources":["../../../source/core/context/AgentRunner.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAiBH,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAe3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAqB7D,qBAAa,kBAAmB,YAAW,YAAY;IAErD,OAAO,CAAC,WAAW,CAAkB;IAErC,OAAO,CAAC,KAAK,CAAoC;IAEjD,OAAO,CAAC,KAAK,CAA4B;IACzC;;;;;;OAMG;IACH,OAAO,CAAC,cAAc,CAAuB;;IAI7C;;OAEG;IACH,SAAS,IAAI,MAAM;IAInB;;;;;;;OAOG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBjC;;;;;;;OAOG;IACG,GAAG,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC;IA4BrD;;OAEG;IACH,OAAO,CAAC,aAAa;IAarB;;;;;;;;OAQG;YACW,oBAAoB;IAyalC;;;;;OAKG;IACH,OAAO,CAAC,0BAA0B;IA8BlC;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB;IAgD5B;;;;;;OAMG;YACW,yBAAyB;IAuCvC;;OAEG;IACH,aAAa,IAAI,OAAO;CAGzB"}

package/bin/core/{runtime/agent-runner.js → context/AgentRunner.js}

@@ -7,16 +7,20 @@
  * - 在上下文超窗时按策略逐步收紧 compact 参数并重试。
  */
 import { streamText, stepCountIs, } from "ai";
-import { withLlmRequestContext } from "../../logger/index.js";
-import { generateId } from "../../utils.js";
-import { buildContextSystemPrompt, transformPromptsIntoSystemMessages, } from "../prompts/system.js";
-import { createModel } from "../llm/create-model.js";
-import { contextRequestContext } from "../context/request-context.js";
-import { createAgentTools } from "../tools/agent-tools.js";
+import { withLlmRequestContext } from "../../utils/logger/Context.js";
+import { generateId } from "../../process/utils/Id.js";
+import { buildContextSystemPrompt, transformPromptsIntoSystemMessages, } from "../prompts/System.js";
+import { createModel } from "../llm/CreateModel.js";
+import { contextRequestContext, } from "./RequestContext.js";
 import { openai } from "@ai-sdk/openai";
-import { getShipRuntimeContext, getShipRuntimeContextBase, } from "../../server/ShipRuntimeContext.js";
-import { collectSystemPromptProviderResult } from "../prompts/index.js";
-import { extractTextFromUiMessage, extractToolCallsFromUiMessage, } from "./ui-message.js";
+import { getShipRuntimeContext, getRuntimeContextBase, } from "../../process/server/ShipRuntimeContext.js";
+import { collectSystemPromptProviderResult } from "../prompts/SystemProvider.js";
+import { extractTextFromUiMessage, extractToolCallsFromUiMessage, } from "./UiMessage.js";
+import { loadProjectDotenv } from "../../process/project/Config.js";
+import { shellTools } from "../shell/Tool.js";
+function toShipContextChannel(chat) {
+    return chat ?? "api";
+}
 export class ContextAgentRunner {
     // 是否初始化
     initialized = false;
@@ -36,7 +40,7 @@ export class ContextAgentRunner {
      * 获取运行时 logger。
      */
     getLogger() {
-        return getShipRuntimeContextBase().logger;
+        return getRuntimeContextBase().logger;
     }
     /**
      * 初始化 Agent 运行依赖。
@@ -48,7 +52,10 @@ export class ContextAgentRunner {
      */
     async initialize() {
         try {
-            this.tools = createAgentTools();
+            // 注意：不要在模块顶层读取 runtime context，否则像 `sma -v` 这种只打印版本号的场景也会因为未初始化而崩溃
+            const runtime = getShipRuntimeContext();
+            loadProjectDotenv(runtime.rootPath);
+            this.tools = { ...shellTools };
             this.model = await createModel({
                 config: getShipRuntimeContext().config,
             });
@@ -119,7 +126,6 @@ export class ContextAgentRunner {
     async runWithToolLoopAgent(userText, startTime, contextId, opts) {
         const toolCalls = [];
         let hadToolFailure = false;
-        const toolFailureSummaries = [];
         const retryAttempts = opts?.retryAttempts ?? 0;
         const laneMergeAttempts = opts?.laneMergeAttempts ?? 0;
         const drainLaneMerged = opts?.drainLaneMerged;
@@ -145,37 +151,35 @@ export class ContextAgentRunner {
                 contextId,
                 requestId,
             });
-            // phase 1（中文）：收集 provider 结果（附加系统消息 + activeTools）。
-            const providerResult = await collectSystemPromptProviderResult({
+            const staticSystemMessages = transformPromptsIntoSystemMessages([
+                ...runtime.systems,
+            ]);
+            let currentProviderResult = await collectSystemPromptProviderResult({
                 projectRoot: runtime.rootPath,
                 contextId,
                 requestId,
                 allToolNames: Object.keys(this.tools),
             });
-            const staticSystemMessages = transformPromptsIntoSystemMessages([
-                ...runtime.systems,
-            ]);
-            const baseSystemMessages = [
+            let currentBaseSystemMessages = [
                 ...runtimeSystemMessages,
                 ...staticSystemMessages,
-                ...providerResult.messages,
+                ...currentProviderResult.messages,
             ];
             const compactPolicy = this.resolveCompactPolicy(retryAttempts);
             let compacted = false;
             try {
                 const compactResult = await contextStore.compactIfNeeded({
                     model: this.model,
-                    system: baseSystemMessages,
+                    system: currentBaseSystemMessages,
                     keepLastMessages: compactPolicy.keepLastMessages,
                     maxInputTokensApprox: compactPolicy.maxInputTokensApprox,
                     archiveOnCompact: compactPolicy.archiveOnCompact,
                 });
-                compacted = Boolean(compactResult?.compacted);
+                compacted = Boolean(compactResult.compacted);
             }
             catch {
                 // ignore compact failure; fallback to un-compacted context messages
             }
-            let currentProviderResult = providerResult;
             if (compacted) {
                 // 关键点（中文）：compact 后重新聚合 provider，保证 prompt 与 activeTools 同步最新状态。
                 currentProviderResult = await collectSystemPromptProviderResult({
@@ -184,13 +188,15 @@ export class ContextAgentRunner {
                     requestId,
                     allToolNames: Object.keys(this.tools),
                 });
+                currentBaseSystemMessages = [
+                    ...runtimeSystemMessages,
+                    ...staticSystemMessages,
+                    ...currentProviderResult.messages,
+                ];
             }
-            const currentBaseSystemMessages = [
-                ...runtimeSystemMessages,
-                ...staticSystemMessages,
-                ...currentProviderResult.messages,
-            ];
-            let baseModelMessages = (await contextStore.toModelMessages({ tools: this.tools }));
+            let baseModelMessages = await contextStore.toModelMessages({
+                tools: this.tools,
+            });
             if (!Array.isArray(baseModelMessages) || baseModelMessages.length === 0) {
                 baseModelMessages = [{ role: "user", content: userText }];
             }
@@ -228,14 +234,10 @@ export class ContextAgentRunner {
                     return { reloaded: false };
                 try {
                     const r = await drainLaneMerged();
-                    const drained = r && typeof r.drained === "number"
-                        ? r.drained
-                        : 0;
+                    const drained = r && typeof r.drained === "number" ? r.drained : 0;
                     if (drained <= 0)
                         return { reloaded: false, drained: 0 };
-                    const mergedMessages = Array.isArray(r?.messages)
-                        ? r.messages
-                        : [];
+                    const mergedMessages = Array.isArray(r?.messages) ? r.messages : [];
                     const appended = appendMergedLaneMessages(mergedMessages);
                     needsLaneResync = true;
                     void logger.log("debug", "Lane merged messages detected; appended queued user messages for next step", {
@@ -260,13 +262,14 @@ export class ContextAgentRunner {
             };
             const toolsWithLaneMerge = {};
             for (const [toolName, tool] of Object.entries(this.tools)) {
-                const exec = tool?.execute;
+                const toolWithExecute = tool;
+                const exec = toolWithExecute.execute;
                 if (typeof exec !== "function") {
                     toolsWithLaneMerge[toolName] = tool;
                     continue;
                 }
                 toolsWithLaneMerge[toolName] = {
-                    ...tool,
+                    ...toolWithExecute,
                     execute: async (...args) => {
                         try {
                             return await exec.apply(tool, args);
@@ -302,10 +305,13 @@ export class ContextAgentRunner {
                                 ? baseModelMessages.length
                                 : 0;
                         }
-                        const stepOverrides = this.buildStepOverrides({
-                            providerResult: currentProviderResult,
-                            baseSystemMessages: currentBaseSystemMessages,
-                        });
+                        const stepOverrides = {
+                            system: currentBaseSystemMessages,
+                        };
+                        if (Array.isArray(currentProviderResult.activeTools) &&
+                            currentProviderResult.activeTools.length > 0) {
+                            stepOverrides.activeTools = currentProviderResult.activeTools;
+                        }
                         return {
                             ...stepOverrides,
                             ...(Array.isArray(outMessages)
@@ -323,7 +329,7 @@ export class ContextAgentRunner {
             let finalAssistantUiMessage = null;
             try {
                 const ctx = contextRequestContext.getStore();
-                const channel = ctx?.channel || "api";
+                const channel = toShipContextChannel(ctx?.chat);
                 const targetId = String(ctx?.targetId || contextId);
                 const md = {
                     v: 1,
@@ -347,8 +353,8 @@ export class ContextAgentRunner {
                     generateMessageId: () => `a:${contextId}:${generateId()}`,
                     // 关键点（中文）：metadata 通过 ai-sdk 的 UIMessage 生成管线注入，避免我们手工改写最终 message。
                     messageMetadata: () => md,
-                    onFinish: (e) => {
-                        finalAssistantUiMessage = e?.responseMessage ?? null;
+                    onFinish: (event) => {
+                        finalAssistantUiMessage = event.responseMessage ?? null;
                     },
                 });
                 // 关键点（中文）：必须消费完整 UIMessage stream，onFinish 才会触发并产出 responseMessage。
@@ -398,10 +404,6 @@ export class ContextAgentRunner {
                         "success" in parsed &&
                         parsed.success === false) {
                         hadToolFailure = true;
-                        const err = parsed.error ||
-                            parsed.stderr ||
-                            "unknown error";
-                        toolFailureSummaries.push(`${tc.tool}: ${String(err)}`.slice(0, 200));
                     }
                 }
                 catch {
@@ -420,7 +422,7 @@ export class ContextAgentRunner {
                 : "";
             if (!assistantText) {
                 try {
-                    assistantText = String((await result?.text) ?? "").trim();
+                    assistantText = String((await result.text) ?? "").trim();
                 }
                 catch {
                     assistantText = "";
@@ -480,8 +482,8 @@ export class ContextAgentRunner {
     buildRuntimeSystemMessages(input) {
         const contextCtx = contextRequestContext.getStore();
         const runtimeExtraContextLines = [];
-        if (contextCtx?.channel)
-            runtimeExtraContextLines.push(`- Channel: ${contextCtx.channel}`);
+        if (contextCtx?.chat)
+            runtimeExtraContextLines.push(`- Channel: ${contextCtx.chat}`);
         if (contextCtx?.targetId)
             runtimeExtraContextLines.push(`- TargetId: ${contextCtx.targetId}`);
         if (contextCtx?.actorId)
@@ -500,24 +502,6 @@ export class ContextAgentRunner {
             },
         ];
     }
-    /**
-     * 构造 step 覆盖配置。
-     *
-     * 关键点（中文）
-     * - provider 有 messages 时，用运行时系统消息替换默认系统消息。
-     * - provider 有 activeTools 时，收敛可用工具集合。
-     */
-    buildStepOverrides(input) {
-        const out = {};
-        if (Array.isArray(input.providerResult.messages)) {
-            out.system = input.baseSystemMessages;
-        }
-        if (Array.isArray(input.providerResult.activeTools) &&
-            input.providerResult.activeTools.length > 0) {
-            out.activeTools = input.providerResult.activeTools;
-        }
-        return out;
-    }
     /**
      * 计算 compact 重试策略。
      *
@@ -527,21 +511,20 @@ export class ContextAgentRunner {
      */
     resolveCompactPolicy(retryAttempts) {
         const runtime = getShipRuntimeContext();
-        const baseKeepLastMessages = typeof runtime.config?.context?.messages?.keepLastMessages ===
-            "number"
-            ? Math.max(6, Math.min(5000, Math.floor(runtime.config.context.messages.keepLastMessages)))
+        const contextMessagesConfig = runtime.config.context?.messages;
+        const baseKeepLastMessages = typeof contextMessagesConfig?.keepLastMessages === "number"
+            ? Math.max(6, Math.min(5000, Math.floor(contextMessagesConfig.keepLastMessages)))
             : 30;
-        const baseMaxInputTokensApprox = typeof runtime.config?.context?.messages?.maxInputTokensApprox ===
-            "number"
-            ? Math.max(2000, Math.min(200_000, Math.floor(runtime.config.context.messages.maxInputTokensApprox)))
+        const baseMaxInputTokensApprox = typeof contextMessagesConfig?.maxInputTokensApprox === "number"
+            ? Math.max(2000, Math.min(200_000, Math.floor(contextMessagesConfig.maxInputTokensApprox)))
             : 16000;
         // 关键点（中文）：当 provider 报错超窗时，会进入 retry；此时需要更激进的 compact。
         const retryFactor = Math.max(1, Math.pow(2, retryAttempts));
         const keepLastMessages = Math.max(6, Math.floor(baseKeepLastMessages / retryFactor));
         const maxInputTokensApprox = Math.max(2000, Math.floor(baseMaxInputTokensApprox / retryFactor));
-        const archiveOnCompact = runtime.config?.context?.messages?.archiveOnCompact === undefined
+        const archiveOnCompact = contextMessagesConfig?.archiveOnCompact === undefined
             ? true
-            : Boolean(runtime.config.context.messages.archiveOnCompact);
+            : Boolean(contextMessagesConfig.archiveOnCompact);
         return {
             keepLastMessages,
             maxInputTokensApprox,
@@ -560,35 +543,27 @@ export class ContextAgentRunner {
         try {
             const msgs = await contextStore.loadAll();
             const last = msgs.length > 0 ? msgs[msgs.length - 1] : null;
-            const lastText = (() => {
-                if (!last || last.role !== "user")
-                    return "";
-                const parts = Array.isArray(last.parts) ? last.parts : [];
-                return parts
-                    .filter((p) => p && typeof p === "object" && p.type === "text")
-                    .map((p) => String(p.text ?? ""))
-                    .join("\n")
-                    .trim();
-            })();
+            const lastText = last && last.role === "user" ? extractTextFromUiMessage(last) : "";
             if (lastText && lastText === String(userText || "").trim())
                 return;
             const ctx = contextRequestContext.getStore();
-            const channel = ctx?.channel || "api";
+            const channel = toShipContextChannel(ctx?.chat);
             const targetId = String(ctx?.targetId || contextId);
+            const metadata = {
+                contextId,
+                channel,
+                targetId,
+                actorId: ctx?.actorId,
+                actorName: ctx?.actorName,
+                messageId: ctx?.messageId,
+                threadId: typeof ctx?.threadId === "number" ? ctx.threadId : undefined,
+                targetType: ctx?.targetType,
+                requestId,
+                extra: { note: "injected_by_agent_run" },
+            };
             const msg = contextStore.createUserTextMessage({
                 text: userText,
-                metadata: {
-                    contextId,
-                    channel,
-                    targetId,
-                    actorId: ctx?.actorId,
-                    actorName: ctx?.actorName,
-                    messageId: ctx?.messageId,
-                    threadId: typeof ctx?.threadId === "number" ? ctx.threadId : undefined,
-                    targetType: ctx?.targetType,
-                    requestId,
-                    extra: { note: "injected_by_agent_run" },
-                },
+                metadata,
             });
             await contextStore.append(msg);
         }
@@ -603,4 +578,4 @@ export class ContextAgentRunner {
         return this.initialized;
     }
 }
-//# sourceMappingURL=agent-runner.js.map
+//# sourceMappingURL=AgentRunner.js.map

package/bin/core/context/AgentRunner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AgentRunner.js","sourceRoot":"","sources":["../../../source/core/context/AgentRunner.ts"],"names":[],"mappings":"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"}

package/bin/core/context/ContextManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContextManager.d.ts","sourceRoot":"","sources":["../../../source/core/context/ContextManager.ts"],"names":[],"mappings":"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"}

package/bin/core/context/{manager.js → ContextManager.js}

@@ -6,12 +6,12 @@
  * - 负责消息入库与调度入队
  * - 在上下文更新后触发 memory 维护钩子
  */
-import { Scheduler } from "./scheduler.js";
-import { createContextAgent } from "../runtime/agent.js";
-import { ContextStore } from "./context-store.js";
-import { getShipRuntimeContextBase } from "../../server/ShipRuntimeContext.js";
+import { Scheduler } from "./Scheduler.js";
+import { ContextStore } from "./ContextStore.js";
+import { getRuntimeContextBase } from "../../process/server/ShipRuntimeContext.js";
 import path from "node:path";
-import { parseTaskRunContextId, getTaskRunDir, } from "../../services/task/runtime/paths.js";
+import { parseTaskRunContextId, getTaskRunDir, } from "../../services/task/runtime/Paths.js";
+import { ContextAgentRunner } from "./AgentRunner.js";
 /**
  * ContextManager：统一会话运行管理容器。
  *
@@ -24,6 +24,23 @@ export class ContextManager {
     contextStoresByContextId = new Map();
     scheduler;
     runMemoryMaintenance;
+    /**
+     * 归一化 channel 字段为 metadata 可接受值。
+     */
+    toContextChannel(channel) {
+        const normalized = String(channel || "").trim();
+        if (normalized === "telegram")
+            return "telegram";
+        if (normalized === "feishu")
+            return "feishu";
+        if (normalized === "qq")
+            return "qq";
+        if (normalized === "cli")
+            return "cli";
+        if (normalized === "scheduler")
+            return "scheduler";
+        return "api";
+    }
     /**
      * 构造函数：装配 scheduler 与可选回调。
      *
@@ -32,7 +49,7 @@ export class ContextManager {
      * - `runMemoryMaintenance` 由 service 注入，core 只负责触发。
      */
     constructor(params) {
-        const base = getShipRuntimeContextBase();
+        const base = getRuntimeContextBase();
         const queueConfig = base.config?.context?.contextQueue || {};
         this.runMemoryMaintenance = params?.runMemoryMaintenance;
         this.scheduler = new Scheduler({
@@ -78,7 +95,7 @@ export class ContextManager {
         const parsedRun = parseTaskRunContextId(key);
         const created = parsedRun
             ? (() => {
-                const runDir = getTaskRunDir(getShipRuntimeContextBase().rootPath, parsedRun.taskId, parsedRun.timestamp);
+                const runDir = getTaskRunDir(getRuntimeContextBase().rootPath, parsedRun.taskId, parsedRun.timestamp);
                 return new ContextStore(key, {
                     contextDirPath: runDir,
                     messagesDirPath: runDir,
@@ -105,7 +122,7 @@ export class ContextManager {
         const existing = this.agentsByContextId.get(key);
         if (existing)
             return existing;
-        const created = createContextAgent();
+        const created = new ContextAgentRunner();
         this.agentsByContextId.set(key, created);
         return created;
     }
@@ -159,7 +176,7 @@ export class ContextManager {
                 text: params.text,
                 metadata: {
                     contextId,
-                    channel: params.channel,
+                    channel: this.toContextChannel(params.channel),
                     targetId: params.targetId,
                     actorId: params.actorId,
                     actorName: params.actorName,
@@ -216,4 +233,4 @@ export class ContextManager {
         });
     }
 }
-//# sourceMappingURL=manager.js.map
+//# sourceMappingURL=ContextManager.js.map

package/bin/core/context/ContextManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContextManager.js","sourceRoot":"","sources":["../../../source/core/context/ContextManager.ts"],"names":[],"mappings":"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"}

package/bin/core/context/ContextStore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContextStore.d.ts","sourceRoot":"","sources":["../../../source/core/context/ContextStore.ts"],"names":[],"mappings":"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"}

package/bin/core/context/{context-store.js → ContextStore.js}

@@ -9,10 +9,11 @@
 import fs from "fs-extra";
 import { open as openFile, readFile as readFileNative, stat as statNative } from "node:fs/promises";
 import path from "node:path";
-import { convertToModelMessages, generateText } from "ai";
-import { generateId, getShipContextDirPath, getShipContextMessagesArchiveDirPath, getShipContextMessagesMetaPath, getShipContextMessagesPath, getShipContextMessagesDirPath, } from "../../utils.js";
-import { getLogger } from "../../logger/index.js";
-import { getShipRuntimeContextBase } from "../../server/ShipRuntimeContext.js";
+import { convertToModelMessages, generateText, isTextUIPart, } from "ai";
+import { getShipContextDirPath, getShipContextMessagesArchiveDirPath, getShipContextMessagesMetaPath, getShipContextMessagesPath, getShipContextMessagesDirPath, } from "../../process/project/Paths.js";
+import { generateId } from "../../process/utils/Id.js";
+import { getLogger } from "../../utils/logger/Logger.js";
+import { getRuntimeContextBase } from "../../process/server/ShipRuntimeContext.js";
 /**
  * ContextStore：基于 UIMessage 的会话上下文存储（per contextId）。
  *
@@ -35,7 +36,7 @@ export class ContextStore {
     overrideMetaFilePath;
     overrideArchiveDirPath;
     constructor(contextId, options) {
-        const rootPath = String(getShipRuntimeContextBase().rootPath || "").trim();
+        const rootPath = String(getRuntimeContextBase().rootPath || "").trim();
         if (!rootPath)
             throw new Error("ContextStore requires a non-empty rootPath");
         const key = String(contextId || "").trim();
@@ -222,7 +223,7 @@ export class ContextStore {
                 v: 1,
                 contextId: this.contextId,
                 updatedAt: Date.now(),
-                pinnedSkillIds: this.normalizePinnedSkillIds(patch?.pinnedSkillIds ?? prev.pinnedSkillIds),
+                pinnedSkillIds: this.normalizePinnedSkillIds(patch.pinnedSkillIds ?? prev.pinnedSkillIds),
             };
             await this.writeMetaUnsafe(next);
             return next;
@@ -249,7 +250,9 @@ export class ContextStore {
      * 覆盖设置 pinned skills（用于 compact 时自动清理）。
      */
     async setPinnedSkillIds(skillIds) {
-        await this.updateMeta({ pinnedSkillIds: Array.isArray(skillIds) ? skillIds : [] });
+        await this.updateMeta({
+            pinnedSkillIds: Array.isArray(skillIds) ? skillIds : [],
+        });
     }
     /**
      * 带文件锁的写操作包装。
@@ -274,9 +277,10 @@ export class ContextStore {
                 await fh.close();
                 break;
             }
-            catch (e) {
-                if (e && e.code !== "EEXIST")
-                    throw e;
+            catch (error) {
+                const err = error;
+                if (err.code !== "EEXIST")
+                    throw err;
                 try {
                     const stat = await statNative(lockPath);
                     const age = Date.now() - stat.mtimeMs;
@@ -380,10 +384,11 @@ export class ContextStore {
      * 构造 user 文本消息（UIMessage 结构）。
      */
     createUserTextMessage(params) {
+        const { ts, ...metadata } = params.metadata;
         const md = {
             v: 1,
-            ts: typeof params.metadata.ts === "number" ? params.metadata.ts : Date.now(),
-            ...params.metadata,
+            ts: typeof ts === "number" ? ts : Date.now(),
+            ...metadata,
             source: "ingress",
             kind: "normal",
         };
@@ -400,10 +405,11 @@ export class ContextStore {
      * 构造 assistant 文本消息（可标记 normal/summary 与 source）。
      */
     createAssistantTextMessage(params) {
+        const { ts, ...metadata } = params.metadata;
         const md = {
             v: 1,
-            ts: typeof params.metadata.ts === "number" ? params.metadata.ts : Date.now(),
-            ...params.metadata,
+            ts: typeof ts === "number" ? ts : Date.now(),
+            ...metadata,
             source: params.source || "egress",
             kind: params.kind || "normal",
             ...(params.sourceRange ? { sourceRange: params.sourceRange } : {}),
@@ -443,7 +449,7 @@ export class ContextStore {
             const role = m.role === "user" ? "user" : "assistant";
             const parts = Array.isArray(m.parts) ? m.parts : [];
             const textParts = parts
-                .filter((p) => p && typeof p === "object" && p.type === "text" && typeof p.text === "string")
+                .filter(isTextUIPart)
                 .map((p) => String(p.text ?? ""));
             const text = textParts.join("\n").trim();
             if (!text)
@@ -474,7 +480,7 @@ export class ContextStore {
         if (snapshot.length <= params.keepLastMessages + 2)
             return { compacted: false, reason: "small_messages" };
         const systemText = (params.system || [])
-            .map((m) => String(m?.content ?? ""))
+            .map((m) => String(m.content ?? ""))
             .join("\n\n");
         // 关键点（中文）：context messages 现在可能包含 tool parts/output，必须把它们计入预算估算，否则会低估 token。
         let messagesJson = "";
@@ -575,9 +581,9 @@ export class ContextStore {
      * 转换为模型输入 messages。
      *
      * 关键点（中文）
-     * - 去掉 UIMessage 的 id 字段，仅保留模型可消费结构。
-     * - `ignoreIncompleteToolCalls=true` 以容忍中断场景下的半成品 tool 记录。
-     */
+    * - 去掉 UIMessage 的 id 字段，仅保留模型可消费结构。
+    * - `ignoreIncompleteToolCalls=true` 以容忍中断场景下的半成品 tool 记录。
+    */
     async toModelMessages(params) {
         const msgs = await this.loadAll();
         // convertToModelMessages 需要的是“没有 id 的 UIMessage”
@@ -591,4 +597,4 @@ export class ContextStore {
         });
     }
 }
-//# sourceMappingURL=context-store.js.map
+//# sourceMappingURL=ContextStore.js.map