@margay/ccl-core 1.5.1-alpha.4 → 1.5.1-alpha.5

package/dist/sdk/mcpServer.d.ts

@@ -22,7 +22,7 @@ export type McpSdkServerConfigWithInstance = {
     instance?: Server;
     [key: string]: unknown;
 };
-/** Define one in-process tool (Claude-Agent-SDK-compatible signature). */
+/** Define one in-process tool (compatible agent SDK signature). */
 export declare function tool(name: string, description: string, inputSchema: ZodRawShape, handler: SdkMcpToolDefinition['handler'], extras?: Pick<SdkMcpToolDefinition, 'annotations' | 'searchHint' | 'alwaysLoad'>): SdkMcpToolDefinition;
 /**
  * Build an in-process MCP server from host-defined JS tools. Returns a config carrying the live

package/dist/sdk/mcpServer.js

@@ -6,7 +6,7 @@ import { randomUUID } from 'node:crypto';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { CallToolRequestSchema, ListToolsRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
 import { z } from 'zod/v4';
-/** Define one in-process tool (Claude-Agent-SDK-compatible signature). */
+/** Define one in-process tool (compatible agent SDK signature). */
 export function tool(name, description, inputSchema, handler, extras) {
     return { name, description, inputSchema, handler, ...(extras ?? {}) };
 }

package/dist/sdk/query.js

@@ -102,7 +102,7 @@ export function buildCliArgs(options) {
     if (options.cwd)
         args.push('--cwd', options.cwd);
     // slice sdk-token-streaming (G3): opt-in token-level streaming — the CLI then emits stream_event
-    // (Anthropic raw message stream) deltas. Default off keeps the minimal event set unchanged.
+    // (Messages API raw message stream) deltas. Default off keeps the minimal event set unchanged.
     if (options.includePartialMessages)
         args.push('--include-partial-messages');
     if (options.includeErrorDiagnostics)
@@ -831,7 +831,7 @@ export async function* queryWithTransport(prompt, options, transport) {
                     break;
                 }
                 case 'stream_event': {
-                    // slice sdk-token-streaming (G3): forward one Anthropic raw message stream event
+                    // slice sdk-token-streaming (G3): forward one Messages API raw message stream event
                     // (token-level delta). Only arrives when includePartialMessages passed the flag.
                     const streamEvent = message.event;
                     if (streamEvent && typeof streamEvent.type === 'string') {

package/dist/sdk/types.d.ts

@@ -2,10 +2,8 @@
  * ccl-sdk public types — the embeddable SDK form of CCL (issue: CCL 改造升级,
  * 抽出可内嵌的 SDK 形态支撑 margay 内嵌 CoS 常驻运行).
  *
- * The interface shape deliberately mirrors the Anthropic Claude Agent SDK
- * (query() + canUseTool callback + session resume) so a host like margay can
- * keep a single call seam and swap between ccl-sdk (domestic-model customers)
- * and the Anthropic Agent SDK (Claude customers).
+ * The interface exposes query(), a canUseTool callback, and session resume
+ * so hosts can keep a shared calling interface across compatible runtimes.
  *
  * Wire contract: these types mirror the stream-json control protocol that
  * cli/print.ts + cli/structuredIO.ts already speak. The SDK is the HOST side
@@ -138,7 +136,7 @@ export type QueryOptions = {
     /**
      * slice sdk-token-streaming (G3): emit `stream_event` deltas as they arrive (token-level
      * streaming). Passes `--include-partial-messages` to the CLI so the subprocess streams
-     * Anthropic raw message stream events (content_block_delta/text_delta, etc.). Default off →
+     * Messages API raw message stream events (content_block_delta/text_delta, etc.). Default off →
      * unchanged behavior; the full-block `assistant_text` events are still emitted alongside.
      */
     includePartialMessages?: boolean;
@@ -181,7 +179,7 @@ export type QueryOptions = {
     skillsDirs?: string[];
     /**
      * Model provider (issue P0-4). 'anthropic' maps to --base-url/--api-key
-     * (any Anthropic-protocol endpoint). 'openai-compatible' maps to CCL's
+     * (any Messages API endpoint). 'openai-compatible' maps to CCL's
      * gateway channel (CCL_GATEWAY_URL/CCL_GATEWAY_KEY) — CCL reaches
      * OpenAI-compatible models through its gateway, which normalizes
      * tool-calling and rejects models without native function calling instead
@@ -446,7 +444,7 @@ type SDKEventPayload = {
     message: Record<string, unknown>;
 }
 /**
- * slice sdk-token-streaming (G3): one Anthropic raw message stream event (token-level delta),
+ * slice sdk-token-streaming (G3): one Messages API raw message stream event (token-level delta),
  * emitted only when `includePartialMessages` is set. `event.type` is one of
  * content_block_start / content_block_delta / content_block_stop / message_delta /
  * message_start / message_stop; e.g. a content_block_delta carries `delta.text` (text_delta).

package/dist/sdk/types.js

@@ -2,10 +2,8 @@
  * ccl-sdk public types — the embeddable SDK form of CCL (issue: CCL 改造升级,
  * 抽出可内嵌的 SDK 形态支撑 margay 内嵌 CoS 常驻运行).
  *
- * The interface shape deliberately mirrors the Anthropic Claude Agent SDK
- * (query() + canUseTool callback + session resume) so a host like margay can
- * keep a single call seam and swap between ccl-sdk (domestic-model customers)
- * and the Anthropic Agent SDK (Claude customers).
+ * The interface exposes query(), a canUseTool callback, and session resume
+ * so hosts can keep a shared calling interface across compatible runtimes.
  *
  * Wire contract: these types mirror the stream-json control protocol that
  * cli/print.ts + cli/structuredIO.ts already speak. The SDK is the HOST side

package/docs/ccl-duo-agent.md

@@ -133,6 +133,6 @@ WS_NO_BUFFER_UTIL=1 ~/.local/bin/ccl --ide
 
 前提是 IDE 已安装兼容扩展、打开同一项目，并与 CCL 使用同一配置目录。完整步骤、默认连接失败记录和连接范围见 [CCL 在 VS Code 中的使用说明](ccl-ide-usage.md)。此临时参数没有修复产品默认行为，也不涉及 Gateway 升级。
 
-`/ide` 接通编辑器能力，聊天仍在 CCL 终端。Claude Code、Codex 各自有官方原生聊天扩展；使用它们的聊天面板运行 CCL，以及迁移当前 Duo 会话，均尚未验证。专用 Duo 面板、tmux 中的完整版 RLL 和 SDK 多用户服务另行处理。
+`/ide` 接通编辑器能力，聊天仍在 CCL 终端。通过其它扩展的聊天面板运行 CCL，以及迁移当前 Duo 会话，均尚未验证。专用 Duo 面板、tmux 中的完整版 RLL 和 SDK 多用户服务另行处理。
 
 普通 `/buddy` 先创建或复用 Team，再按返回的实际团队名启动 Agent；`/buddy --peer-review` 仍需固定审核模型和开发目标。两条 Buddy 路径与 Duo 的完成条件不同，详见[轻量开发审查说明](peer-development-review.md)。

package/docs/error-recovery-usage.md

@@ -229,9 +229,9 @@ CCL 将响应读取中断与用户取消区分处理。半截响应尚未执行
 恢复诊断包含网关 request ID、底层连接错误及恢复阶段。连续中断会停止自动恢复并返回失败，
 不会无限重试，也不声称修复了 VPN 或网关自身的连接问题。
 
-# 记忆提取未完成的提示
+# 记忆提取未完成的诊断日志
 
-以下提示适用于 `1.5.1-alpha`；正在运行的旧进程不会因为源码或安装更新而自动采用新提示，需要正常退出后重启。
+从 `1.5.1-alpha.5` 起，后台记忆提取的失败、恢复和退出等待超时只进入现有调试日志，不再写入普通会话消息或默认 CLI/SDK stderr。可通过 `--debug-file <文件>` 保存诊断；用户显式选择 `--debug-to-stderr` 时仍遵循该日志设置。日志是否启用和保留由现有设置决定，不新增默认采集。
 
 `Memory extraction did not complete (...); saving is not confirmed` 表示本次提取没有满足完整结束和工具结果确认条件，不能据此宣称这些输入已全部保存。括号里的原因来自实际分支，例如：
 
@@ -241,8 +241,10 @@ CCL 将响应读取中断与用户取消区分处理。半截响应尚未执行
 - `output_limit` / `response_not_finished`：最终响应达到输出限制，或没有完整结束。
 - `system_blocked` / `interrupted` / `runtime_error`：系统阻断、取消中断，或提取处理抛出异常。后者没有足够信息细分时不猜测是网络或权限问题。
 
-同一失败期间不会重复显示相同原因，出现新的失败类别仍会提示。下一次符合提取条件的正常回合可重试原输入；这不是退出后必定重试的承诺。`Memory extraction checks have resumed` 只说明检查恢复，不说明历史所有信息都已保存；成功写入通知是另一个事件。
+同一失败期间的固定摘要不重复记录相同原因，出现新的失败类别会追加摘要，已有详细错误日志和原因事件继续保留。下一次符合提取条件的正常回合可重试原输入；这不是退出后必定重试的承诺。日志中的 `Memory extraction checks have resumed` 只说明检查恢复，不说明历史所有信息都已保存；有已确认写入时的成功保存通知保持原行为。
 
-原因提示不附加任意模型/工具正文、路径或异常文本；现有本地调试日志仍可能包含详细错误，不能把整份日志默认当成可对外公开的材料。此修复不提高预算、不新增全记忆扫描、不改变按需读索引和主题文件，也不使宿主记忆成为可靠业务账本。
+固定摘要和原因事件不附加任意模型/工具正文、路径或异常文本；现有本地调试日志仍可能包含详细错误，不能把整份日志默认当成可对外公开的材料。静默展示不改变失败判定、未确认输入游标、权限或重试条件，也不提高预算、新增全记忆扫描，或使宿主记忆成为可靠业务账本。
+
+正在运行的旧进程不会因安装更新而自动换用新代码；需要正常退出后重新启动。旧会话中已保存的提示也不会被删除，新版本恢复历史时仍可能显示原有记录。
 
 旧 `Memory lookup is incomplete...` 属于已移除的自动发现路径，与这里的提取提示不同。看到旧文本时应区分历史记录重绘与旧进程的新消息，核对实际安装和运行版本，不能靠新源码中没有这句话就判定运行中的进程已更新。

package/docs/gateway-quickstart.md

@@ -74,7 +74,7 @@ Start `node dist/cli.js`, then use:
 | `/gateway status` | Verify saved account; show membership and credit balance |
 | `/gateway logout` | Remove the saved account locally |
 | `/gateway doctor` | Diagnose gateway configuration and environment overrides |
-| `/login` | Claude OAuth, a separate authentication path |
+| `/login` | Margay website login/registration, the same flow as `/gateway login` |
 
 At the first-launch account step, Enter starts website login; S or Esc defers
 setup. During TUI login, Esc cancels. After an error, Enter or R retries.
@@ -227,7 +227,7 @@ before repeating work that may have side effects. SDK hosts can opt into
 ## Troubleshooting
 
 In the source candidate, headless runs with `CI=1` can authenticate using an
-admitted gateway configuration alone. A separate Anthropic API key is not
+admitted gateway configuration alone. A separate direct API key is not
 required for that route. Missing or rejected gateway credentials still require
 a valid login or another supported credential source. This fixes a startup
 failure present in rc.9; it does not change the gateway's 401 handling.

package/docs/releases/1.5.1-alpha.5.md

@@ -0,0 +1,35 @@
+# 1.5.1-alpha.5
+
+本预发布版在 [1.5.1-alpha.4](1.5.1-alpha.4.md) 基础上交付 CCL 产品文案清理、并行 Skill 正文恢复，以及图片本地校验和读取说明修复。发布后可安装指定版本：
+
+```bash
+npm install -g @margay/ccl-core@1.5.1-alpha.5
+```
+
+使用 `alpha` 标签分发，`latest` 保持不变。SDK/桌面宿主需升级实际嵌入的 CLI 与 SDK 依赖；全局安装不会自动替换宿主内置版本。已运行的会话和 daemon 不会因安装自动重启。
+
+## 产品文案与 tips
+
+清理界面、帮助、提示和错误信息中的上游产品推广，替换为 CCL 用语及 12 条自定义 tips。实际使用中的模型名称、兼容协议/API 标识、用户内容及法律归属按其用途保留。更新不改写既有会话文本。
+
+## 并行 Skill 正文恢复（#61）
+
+恢复会话时，保留同一并行响应中已经持久化、且关联来源有效的 Skill 方法正文，避免只恢复“加载成功”的工具结果却漏掉正文。恢复逻辑检查来源和分支范围，不把普通工具返回或无关旁支提升为技能正文。
+
+修复位于共享读取恢复链，适用于原生 resume/fork 消费者；宿主无需另建正文持久化器。不会改写历史、重新执行工具或重放权限，也无法恢复中断前从未持久化的内容。验证覆盖真实 writer 的不同落盘断点、并行交错、重复恢复、resume/fork 及真实模型对恢复规则的消费。
+
+## 图片读取与视觉分工（#62，部分交付）
+
+Read 对支持的图片格式执行本地元数据与像素解码校验；损坏或不支持的输入在本地明确失败。成功结果保留图片内容，并附本地读取回执。读取成功不代表网关已把原图交给模型，也不代表当前主模型能够理解图片。
+
+移除 Read 说明中无条件宣称主模型具有视觉能力的表述，协调 `visual-ui-analysis` 的适用说明。专员成功路径不要求先出现图片错误，也不要求先将 PNG 转为 JPEG。既有网关诊断继续区分本地读取、模型/路由与适配失败；HTTP 200 不能单独作为视觉成功证据。
+
+验证包含真实直接附件视觉请求、专员路径与专员不可用场景，以及 CLI/SDK 的拒绝、空结果和诊断传播。先前真实模型错误归因的失败记录保留，后续成功不证明所有模型都稳定遵循只读要求或不会绕路。
+
+所选模型/部署的版本化视觉能力声明，以及 CCL 的能力接收、模型或路由变化后的刷新，仍待 [网关 #28](https://github.com/YW1975/margay-gateway/issues/28) 契约落地和接入。本版不宣称整体 #62 已解决；能力未知时不按模型名猜测支持情况，也不自动替换用户主模型。
+
+## 兼容与回退
+
+后台记忆提取的失败、恢复和退出等待超时改为现有调试日志，不再显示普通会话警告或写入默认 CLI/SDK stderr；可用 `--debug-file <文件>` 查看原因，显式 `--debug-to-stderr` 仍按用户设置输出。失败输入继续保留供后续符合条件的回合重试，不将未确认保存改判为成功；有确认写入时的成功保存通知保持。旧进程需正常退出后重启，历史已有提示不改写。
+
+本版未改变依赖声明、历史记录格式或权限契约。升级后从原宿主继续使用原会话；安装检查不等于宿主已完成升级。需要回退时可安装此前使用的确切版本，回退不会撤销已经发生的业务操作，旧版本也不包含本次恢复与图片说明修复。

package/docs/self-hosted-product-events.md

@@ -17,7 +17,7 @@ The spool is `analytics-spool-v1.json` in the same private config directory as t
 
 Only an exact authenticated durable-acceptance ACK deletes sent records. Lost ACKs preserve event ID/time/body across restart. Retry delay persists and caps at five minutes; permanent schema/auth rejections are counted and removed. Status reports pending count and expired/overflow/identity/disabled/rejected drops. The session loop sends on startup and every ten seconds, with a three-second request budget and up to one second of shutdown waiting. Full-batch immediate dispatch will be connected with the feature lifecycle registry; it is not present yet. Concurrent CLI processes share the lock, and the gateway deduplicates concurrent/replayed event IDs.
 
-Legacy GrowthBook/Datadog/1P and other legacy background traffic remain suppressed by `CCL_DISABLE_LEGACY_NONESSENTIAL_TRAFFIC`. The CLI no longer overwrites the user's explicit NONESSENTIAL setting. `isClientTelemetryDisabled` checks the original user privacy signals; the old privacy helpers continue suppressing old routes. Optional Anthropic preconnect and official-registry fetch now honor that boundary as well.
+Legacy GrowthBook/Datadog/1P and other legacy background traffic remain suppressed by `CCL_DISABLE_LEGACY_NONESSENTIAL_TRAFFIC`. The CLI no longer overwrites the user's explicit NONESSENTIAL setting. `isClientTelemetryDisabled` checks the original user privacy signals; the old privacy helpers continue suppressing old routes. Optional direct API preconnect and upstream registry fetch now honor that boundary as well.
 
 ## Querying analytics
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@margay/ccl-core",
-  "version": "1.5.1-alpha.4",
-  "description": "Core runtime extracted from Claude Code (ccl) for Margay integration",
+  "version": "1.5.1-alpha.5",
+  "description": "CCL agent runtime for Margay integration",
   "license": "SEE LICENSE IN README.md",
   "type": "module",
   "bin": {
@@ -56,7 +56,8 @@
     "docs/releases/1.5.1-alpha.1.md",
     "docs/releases/1.5.1-alpha.2.md",
     "docs/releases/1.5.1-alpha.3.md",
-    "docs/releases/1.5.1-alpha.4.md"
+    "docs/releases/1.5.1-alpha.4.md",
+    "docs/releases/1.5.1-alpha.5.md"
   ],
   "engines": {
     "node": ">=22.19.0"

package/sdk/API.md

@@ -336,7 +336,7 @@ for await (const event of result) { /* 消费实际结果 */ }
 ## 7. Provider 配置(双引擎)
 
 ```ts
-// Anthropic 协议端点(Claude 客户 / 任何 Anthropic-protocol 网关)
+// Messages API 端点（直连服务或兼容网关）
 provider: { type: 'anthropic', baseUrl?: string, apiKey?: string }
 // → 映射 --base-url / --api-key
 
@@ -347,7 +347,7 @@ provider: { type: 'openai-compatible', baseUrl: string, apiKey?: string }
 
 - `openai-compatible` 的 `baseUrl` 指向 **CCL/margay 网关**(litellm 类,前置 OpenAI 兼容上游);网关负责 tool-calling 归一化,对不支持原生 function calling 的模型**显式报错**而非静默劣化。
 - 省略 `provider` 时继承 CLI 自身配置(`~/.ccl/gateway.json` 等)。
-- margay 双引擎互换:同一调用 seam 下,ccl-sdk 与 Anthropic Agent SDK 的 `query()`/`canUseTool`/resume 形状对齐,切换引擎不改业务代码结构。
+- margay 双引擎互换:同一调用 seam 下,ccl-sdk 与兼容 Agent SDK 的 `query()`/`canUseTool`/resume 形状对齐,切换引擎不改业务代码结构。
 
 ---
 
@@ -475,7 +475,7 @@ for await (const ev of query('写一段', { includePartialMessages: true })) {
   }
 }
 ```
-- 默认关。开后收 `{ type:'stream_event', event }`(Anthropic raw:content_block_delta/text_delta 等);整块 `assistant_text` 仍并存。
+- 默认关。开后收 `{ type:'stream_event', event }`(原始 Messages API 事件：content_block_delta/text_delta 等);整块 `assistant_text` 仍并存。
 
 ### 13.3 结构化输出 jsonSchema(G4)
 ```ts

package/sdk/README.md

@@ -2,9 +2,8 @@
 
 Programmatic, headless, no-TTY entry to a CCL agent session, for hosts like
 margay that need a resident (7×24) agent brain with code-level tool
-interception. The interface shape mirrors the Anthropic Claude Agent SDK
-(`query()` + `canUseTool` + session resume) so a host can keep one call seam
-and swap engines.
+interception. It exposes `query()`, `canUseTool`, and session resume for
+streaming responses, host-controlled tool permissions, and continuing sessions.
 
 ## Usage
 
@@ -116,8 +115,7 @@ The SDK is the **host side** of the stream-json control protocol that
 CLI as a **managed subprocess** (`--print --input-format stream-json
 --output-format stream-json`, all-pipe stdio, no TTY), which keeps every CLI
 behavior — tools, skills, hooks, session persistence, gateway/model routing —
-byte-identical between CLI and SDK use. This matches how the Anthropic Agent
-SDK wraps Claude Code.
+consistent between CLI and SDK use.
 
 Permission flow (`canUseTool` set ⇒ `--permission-prompt-tool stdio`):
 
@@ -143,7 +141,7 @@ session continues). Wire schemas live in
 | P0-2 fail-closed (throw / timeout / unrecognized ⇒ deny, tool never runs) | **done**, unit-tested |
 | P0-2 `pending` + suspend + cross-process resume | **done** — see mechanism below; `resumeWithDecision(sessionId, {behavior})` |
 | P0-3 session persistence + `resume(session_id)` | **done** — transcripts via the CLI's store (`--session-id`/`--resume`); SDK-level state (pending approvals, usage) via the pluggable `SessionStore` (file reference impl; Redis/DB implement the same 6-method interface) |
-| P0-4 provider layer (Anthropic + OpenAI-compatible) | **done at the SDK seam** — `provider: {type:'anthropic'}` → `--base-url`/`--api-key`; `{type:'openai-compatible'}` → CCL gateway channel (`CCL_GATEWAY_URL`/`KEY`), which normalizes tool-calling and rejects non-function-calling models explicitly. Mapping unit-tested; live two-provider round-trip belongs to the DoD slice (CoS side provides mock endpoints per the issue). |
+| P0-4 provider layer (Messages API + OpenAI-compatible) | **done at the SDK seam** — `provider: {type:'anthropic'}` → `--base-url`/`--api-key`; `{type:'openai-compatible'}` → CCL gateway channel (`CCL_GATEWAY_URL`/`KEY`), which normalizes tool-calling and rejects non-function-calling models explicitly. Mapping unit-tested; live two-provider round-trip belongs to the DoD slice (CoS side provides mock endpoints per the issue). |
 | P1-5 explicit `skills_dirs` | **done** — each dir is wrapped as an ephemeral plugin (skills symlink) and loaded via `--plugin-dir`, the CLI's cwd-independent skill channel; missing dirs fail loudly |
 | P1-6 hooks (`on_tool_use`/`on_turn_end`/`on_session_end`) | **done** — observability-only contract: hook errors are swallowed, never affect control flow |
 | P1-7 usage in `result` event + per-session accumulation | **done** — provider-raw `usage` + `total_cost_usd` on every result; accumulated per session in the store, queryable via `getSessionUsage(sessionId)` |
@@ -199,7 +197,7 @@ that mode's available set; an explicit incompatible selection such as
 still apply; `--allowedTools` does not add tools to the available set.
 
 Use `extraArgs: ['--thinking', 'disabled']` to explicitly disable thinking on
-Anthropic Messages compatible routes. Omitting the option retains the route's
+Messages API compatible routes. Omitting the option retains the route's
 default. The selection persists across requests; a query handle's
 `setMaxThinkingTokens(0)` explicitly disables it, and `null` restores the default.
 # Persistent sessions and streamed input