@margay/ccl-core 1.5.1-alpha.2 → 1.5.1-alpha.3

package/dist/sdk/cancellation.d.ts

@@ -0,0 +1,15 @@
+import { z } from 'zod/v4';
+/** Control-channel provenance, not the identity or intent of a person. */
+export declare const hostCancellationSchema: z.ZodObject<{
+    origin: z.ZodLiteral<"host">;
+    reason: z.ZodEnum<{
+        cancelled: "cancelled";
+        timeout: "timeout";
+        connection_closed: "connection_closed";
+        callback_error: "callback_error";
+        permission_denied: "permission_denied";
+    }>;
+}, z.core.$strict>;
+export type HostCancellation = z.infer<typeof hostCancellationSchema>;
+export declare function readHostCancellation(value: unknown): HostCancellation | undefined;
+export declare function hostCancellationMessage(cancellation: HostCancellation, execution?: 'not_started' | 'unknown'): string;

package/dist/sdk/cancellation.js

@@ -0,0 +1,18 @@
+import { z } from 'zod/v4';
+/** Control-channel provenance, not the identity or intent of a person. */
+export const hostCancellationSchema = z.object({
+    origin: z.literal('host'),
+    reason: z.enum(['cancelled', 'timeout', 'connection_closed', 'callback_error', 'permission_denied']),
+}).strict();
+export function readHostCancellation(value) {
+    const parsed = hostCancellationSchema.safeParse(value);
+    return parsed.success ? parsed.data : undefined;
+}
+export function hostCancellationMessage(cancellation, execution = 'unknown') {
+    return `Host control channel ended this turn (${JSON.stringify(cancellation)}). ` +
+        (cancellation.reason === 'permission_denied'
+            ? 'The host ended the turn after a permission denial; preserve the recorded decision without inferring who made it. '
+            : 'This lifecycle cancellation is not a user permission refusal or a user preference. ') +
+        (execution === 'not_started' ? 'This tool call was not executed. ' : 'A missing result does not establish whether an in-flight operation had effects. ') +
+        'Stop this turn. On a later authorized continuation, retain completed results and check existing execution evidence before repeating side effects. This cancellation grants no permission and does not revoke unrelated existing authorization.';
+}

package/dist/sdk/index.d.ts

@@ -9,6 +9,7 @@ export { buildCliArgs, buildCliEnv, decideFailClosed, getSessionUsage, prepareSk
 export { query, queryHandleWithTransport } from './queryHandle.js';
 export { createSession, Session, type SessionOptions, type SessionControls, type Turn, type TurnResult, type InputMetadata } from './session.js';
 export type { InputProvenance } from './inputProvenance.js';
+export type { HostCancellation } from './cancellation.js';
 export { readQueryLifecycle, type QueryLifecycleRead } from './queryLifecycle.js';
 export type { QueryLifecycleRecord, QueryLifecycleObservation, QueryLifecycleWrite } from './queryLifecycleTypes.js';
 export { RuntimeResourcesSchema, RuntimeResourceSchema, type RuntimeResources, type RuntimeResource } from './runtimeResources.js';

package/dist/sdk/query.d.ts

@@ -20,6 +20,7 @@ type PermissionDecisionWire = {
     message: string;
     interaction?: InteractionResponse;
     interrupt?: boolean;
+    cancellation?: import('./cancellation.js').HostCancellation;
     toolUseID: string;
 };
 type CallbackOutcome = {

package/dist/sdk/query.js

@@ -34,6 +34,7 @@ import { existsSync, mkdirSync, mkdtempSync, realpathSync, rmSync, statSync, sym
 import { createHash } from 'crypto';
 import { describeError, errorDetailsList, sanitizeErrorEnvelope, sanitizeErrorText, sanitizeRecoveryDiagnostic, sanitizeRecoveryOutcome } from './errorDiagnostics.js';
 import { interactionResponseSchema } from './interactionResponseSchema.js';
+import { hostCancellationSchema } from './cancellation.js';
 import { tmpdir } from 'os';
 import { dirname, join, resolve } from 'path';
 import { fileURLToPath } from 'url';
@@ -196,6 +197,7 @@ export async function decideFailClosed(callback, toolName, input, context, timeo
     const deny = (message, failClosedReason) => ({
         kind: 'decision',
         decision: { behavior: 'deny', message, toolUseID: context.toolUseId,
+            cancellation: { origin: 'host', reason: timedOut ? 'timeout' : 'callback_error' },
             ...(toolName === 'AskUserQuestion' ? { interaction: { outcome: timedOut ? 'timed_out' : 'interaction_unavailable' } } : {}),
         },
         failClosedReason,
@@ -239,6 +241,10 @@ export async function decideFailClosed(callback, toolName, input, context, timeo
             };
         }
         case 'deny': {
+            const cancellation = hostCancellationSchema.safeParse(raw.cancellation);
+            if (raw.cancellation !== undefined && !cancellation.success) {
+                return deny('Cancellation provenance was invalid; no user choice was inferred.', 'unrecognized_result');
+            }
             const interaction = interactionResponseSchema.safeParse(raw.interaction);
             if (raw.interaction !== undefined && !interaction.success) {
                 return deny('Interaction response was invalid; no user choice was inferred.', 'unrecognized_result');
@@ -250,6 +256,8 @@ export async function decideFailClosed(callback, toolName, input, context, timeo
                     message: sanitizeErrorText(raw.message ?? 'Denied by host'),
                     ...(toolName === 'AskUserQuestion' && interaction.success ? { interaction: interaction.data } : {}),
                     ...(raw.interrupt !== undefined && { interrupt: raw.interrupt }),
+                    ...(cancellation.success ? { cancellation: cancellation.data } : raw.interrupt
+                        ? { cancellation: { origin: 'host', reason: 'permission_denied' } } : {}),
                     toolUseID: context.toolUseId,
                 },
             };
@@ -699,6 +707,7 @@ export async function* queryWithTransport(prompt, options, transport) {
                         toolUseId,
                         behavior: outcome.decision.behavior,
                         ...(outcome.decision.behavior === 'deny' && outcome.decision.interaction ? { interaction: outcome.decision.interaction } : {}),
+                        ...(outcome.decision.behavior === 'deny' && outcome.decision.cancellation ? { cancellation: outcome.decision.cancellation } : {}),
                         source: 'callback',
                         ...(outcome.failClosedReason && {
                             failClosedReason: outcome.failClosedReason,

package/dist/sdk/queryHandle.js

@@ -25,6 +25,7 @@
  */
 import { queryWithTransport, spawnForOptions } from './query.js';
 import { isAsyncInput } from './queryInput.js';
+import { hostCancellationSchema } from './cancellation.js';
 let requestCounter = 0;
 const nextRequestId = () => `ccl-sdk-req-${++requestCounter}-${Math.random().toString(36).slice(2, 10)}`;
 class QueryHandle {
@@ -81,14 +82,15 @@ class QueryHandle {
         // The init promise is settled internally; hosts that never ask for the
         // initialization result must not see an unhandled rejection.
         this.initPromise.catch(() => { });
-        void transport.exited.then(() => this.cancelPermission?.(), () => this.cancelPermission?.());
+        const retired = () => this.cancelPermission?.({ origin: 'host', reason: 'connection_closed' });
+        void transport.exited.then(retired, retired);
         const callback = options.canUseTool;
         void this.pump(prompt, callback ? {
             ...options,
             canUseTool: async (...args) => {
                 let cancel;
                 const cancelled = new Promise(resolve => {
-                    cancel = () => resolve({ behavior: 'deny', message: 'Permission wait cancelled by host', interrupt: true });
+                    cancel = cancellation => resolve({ behavior: 'deny', message: 'Permission wait cancelled by host', interrupt: true, cancellation });
                 });
                 this.cancelPermission = cancel;
                 try {
@@ -220,9 +222,12 @@ class QueryHandle {
         if (response.subtype === 'error') {
             entry.reject(new Error(String(response.error ?? 'control request failed')));
         }
-        else {
+        else if (response.subtype === 'success') {
             entry.resolve(response.response);
         }
+        else {
+            entry.reject(new Error('ccl-sdk: invalid control acknowledgement'));
+        }
     }
     trackInitialize(requestId) {
         this.pending.set(requestId, {
@@ -278,19 +283,34 @@ class QueryHandle {
             return Promise.reject(new Error(this.endReason));
         const requestId = nextRequestId();
         return new Promise((resolve, reject) => {
-            this.pending.set(requestId, { resolve, reject });
+            const timer = opts.timeoutMs ? setTimeout(() => {
+                const entry = this.pending.get(requestId);
+                this.pending.delete(requestId);
+                entry?.reject(new Error('ccl-sdk: interrupt acknowledgement timed out; stop outcome is unknown'));
+            }, opts.timeoutMs) : undefined;
+            this.pending.set(requestId, {
+                resolve: value => { if (timer)
+                    clearTimeout(timer); resolve(value); },
+                reject: error => { if (timer)
+                    clearTimeout(timer); reject(error); },
+            });
             this.transport
                 .write({ type: 'control_request', request_id: requestId, request })
                 .catch(error => {
                 if (this.pending.delete(requestId)) {
+                    if (timer)
+                        clearTimeout(timer);
                     reject(error instanceof Error ? error : new Error(String(error)));
                 }
             });
         });
     }
-    interrupt() {
-        this.cancelPermission?.();
-        return this.controlRequest({ subtype: 'interrupt' });
+    interrupt(cancellation = { origin: 'host', reason: 'cancelled' }) {
+        const parsed = hostCancellationSchema.safeParse(cancellation);
+        if (!parsed.success)
+            return Promise.reject(new Error('ccl-sdk: invalid cancellation provenance'));
+        this.cancelPermission?.(parsed.data);
+        return this.controlRequest({ subtype: 'interrupt', cancellation: parsed.data }, { timeoutMs: 10000 });
     }
     setPermissionMode(mode) {
         return this.controlRequest({ subtype: 'set_permission_mode', mode });
@@ -372,7 +392,7 @@ class QueryHandle {
         return (await this.initializationResult()).account;
     }
     async close() {
-        this.cancelPermission?.();
+        this.cancelPermission?.({ origin: 'host', reason: 'connection_closed' });
         this.markDead('ccl-sdk: query closed');
         await this.transport.close();
     }

package/dist/sdk/queryLifecycleTypes.d.ts

@@ -28,8 +28,8 @@ export declare const QueryLifecycleSchema: z.ZodObject<{
             actor: z.ZodEnum<{
                 unknown: "unknown";
                 agent: "agent";
-                human: "human";
                 host: "host";
+                human: "human";
             }>;
             source: z.ZodString;
             session_id: z.ZodOptional<z.ZodString>;
@@ -113,8 +113,8 @@ export declare const QueryLifecycleObservationSchema: z.ZodObject<{
                 actor: z.ZodEnum<{
                     unknown: "unknown";
                     agent: "agent";
-                    human: "human";
                     host: "host";
+                    human: "human";
                 }>;
                 source: z.ZodString;
                 session_id: z.ZodOptional<z.ZodString>;

package/dist/sdk/types.d.ts

@@ -29,6 +29,8 @@ export type CanUseToolResult = {
     interaction?: import('./interactionResponseSchema.js').InteractionResponse;
     /** Also interrupt the current turn instead of letting the agent continue. */
     interrupt?: boolean;
+    /** Host control-channel provenance; not a human refusal or a new authorization. */
+    cancellation?: import('./cancellation.js').HostCancellation;
 } | {
     /**
      * Suspend the session at this tool call (issue P0-2 pending): the tool
@@ -403,6 +405,7 @@ type SDKEventPayload = {
     behavior: 'allow' | 'deny';
     /** Why the SDK decided this way when the host callback did not decide. */
     failClosedReason?: string;
+    cancellation?: import('./cancellation.js').HostCancellation;
     interaction?: import('./interactionResponseSchema.js').InteractionResponse;
     /** 'pending_decision' when resolved by resumeWithDecision, not the live callback. */
     source?: 'callback' | 'pending_decision';
@@ -479,7 +482,7 @@ export type InitializationResult = {
  * the stream is identical to the bare queryWithTransport generator.
  */
 export interface Query extends AsyncGenerator<SDKEvent, void, unknown> {
-    interrupt(): Promise<unknown>;
+    interrupt(cancellation?: import('./cancellation.js').HostCancellation): Promise<unknown>;
     setPermissionMode(mode: string): Promise<unknown>;
     setModel(model?: string): Promise<unknown>;
     setMaxThinkingTokens(n: number | null): Promise<unknown>;

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

@@ -0,0 +1,23 @@
+# 1.5.1-alpha.3
+
+本预发布版在 [1.5.1-alpha.2](1.5.1-alpha.2.md) 基础上增加宿主取消来源契约（#58）和视觉输出预算配置及有界恢复（#59）。使用明确版本或 `alpha` 标签安装；npm 发布状态以 registry 为准，`latest` 保持不变。
+
+## 宿主停止与权限拒绝
+
+SDK `handle.interrupt()`、权限回调超时/异常和会话退役会保留宿主取消来源，不再被误写成用户拒绝或用户偏好。普通工具 Deny 继续保留拒绝依据；取消不撤销其他授权，也不授予新权限。
+
+`interrupt()` 可接收 `HostCancellation`，权限回调 deny 可附带 `cancellation`；来源也会出现在 `permission_resolved` 和原生 transcript。旧客户端只返回 `deny('Conversation stopped')` 时仍按拒绝处理，需迁移到 interrupt 或显式 cancellation。AskUserQuestion 的非终止 unavailable/timeout 交互保持原行为，不制造用户答案。
+
+取消与结果返回竞态时保留已完成事实，迟到的 allow 不启动已取消的工具。成功停止 ACK 只确认控制请求被接受；拒绝、畸形 ACK、断连或10秒无 ACK 会明确失败，停止结果可能未知。取消不回滚已发生的外部效果，强杀或close也不保证最后消息持久化；恢复前仍需核对事实，不能盲目重放。
+
+## 视觉输出预算
+
+CLI 环境变量 `CCL_VISUAL_MAX_OUTPUT_TOKENS` 默认8192；可选 `CCL_VISUAL_RECOVERY_MAX_OUTPUT_TOKENS` 显式授权一次更高预算恢复，默认不启用。SDK通过已有 `options.env` 配置。值必须是正安全整数，恢复预算必须大于初始预算；非法配置在读图或模型请求前失败。Agent模型不能通过工具参数改预算或覆盖视觉模型。
+
+现有模型输出上限和共享上下文限制仍会约束请求。只有完整终态的输出限额失败、无拒绝/过滤、有效预算确实增加且恢复额度未用时，才会用原模型、协议、提示和已授权图片字节重试。预算被模型上限截平时不发无效重试。空响应与输出限额恢复共用一次内容重试，另允许此前一次能力上下文刷新；至多3次推理共用900秒期限。
+
+成功和失败均记录尝试历史、request ID、请求/有效预算、限制来源、重试关联、耗时及累计已知usage。缺少input/output用量时 `usageComplete=false`，不把未知成本当作零。最终未完成不会报视觉通过。成功结果提示也不再无条件暗示此前发生过失败和恢复。
+
+提高预算可能增加成本，不保证提升视觉准确性。原三图同提示的真实模型对照中，8192和16384都单次完成，未复现旧截断；本次真实运行未触发自动恢复，恢复边界由CLI/SDK接线及单元测试验证。模型仍有精确颜色判断误差，完整输出不能替代业务验收。
+
+使用方式及兼容边界见 [SDK API](../../sdk/API.md)。CLI与SDK保持同版本；已运行进程不会热更新，正常结束后新会话使用新版。未改默认模型、权限策略或业务数据，无需数据迁移。仍不承诺跨外部系统exactly-once、模型始终正确理解图像或任意终止都能回收已发生的副作用。

package/package.json

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

package/sdk/API.md

@@ -213,7 +213,7 @@ type CanUseToolFn = (
 
 type CanUseToolResult =
   | { behavior: 'allow'; updatedInput?: Record<string, unknown> }  // 放行;updatedInput=改写输入(modify)
-  | { behavior: 'deny'; message?: string; interrupt?: boolean }     // 拒绝;interrupt=true 同时中断本回合
+  | { behavior: 'deny'; message?: string; interrupt?: boolean; cancellation?: HostCancellation }
   | { behavior: 'pending' }                                          // 挂起走异步审批(§5)
 ```
 
@@ -222,6 +222,12 @@ type CanUseToolResult =
 - `allow` 未提供 `updatedInput`(或提供空对象)时按原始 input 执行。
 - 未配置 `canUseTool` 时 SDK 不启用权限转发(工具按 CLI 自身权限规则走);若此时 CLI 仍发来请求,按 deny 兜底。
 
+宿主停止与权限拒绝是不同事件。停止生成可直接 `await handle.interrupt()`；它取消未完成权限等待，默认来源为 `{origin:'host',reason:'cancelled'}`。也可传完整的 `HostCancellation`，reason 支持 `cancelled`、`timeout`、`connection_closed`、`callback_error`、`permission_denied`。`origin` 表示控制通道来源，不推断是谁点击了停止。原始 stream-json 请求为 `{type:'control_request',request_id,request:{subtype:'interrupt',cancellation}}`，省略 cancellation 同样表示宿主取消。
+
+需要在权限回调结束等待时，可返回 `{behavior:'deny',message:'Conversation stopped',cancellation:{origin:'host',reason:'cancelled'}}`。这结束当前轮，工具不执行；`permission_resolved.cancellation` 与原生 transcript 的 `toolUseResult.cancellation` 保留来源。回调超时/异常自动携带 timeout/callback_error。AskUserQuestion 的 timed_out/interaction_unavailable 继续按已有非终止交互失败处理，不制造用户答案。未带 cancellation 的普通 deny 仍是拒绝；deny+interrupt 记录 permission_denied 并保留原拒绝依据，不推断人工决定。旧客户端的 `deny('Conversation stopped')` 仍是拒绝，宿主应迁移到 interrupt 或显式 cancellation，CCL 不通过文字猜测来源。
+
+interrupt 的 Promise 只在匹配成功 ACK 后完成；拒绝、畸形 ACK、断连会 reject，10 秒没有 ACK 也会 reject，表示停止结果未知。还须观察当前轮的 result，不能把 ACK 当作工具已回滚。迟到的 allow 不会启动已取消的工具。已完成结果保留；在途操作缺少结果不能证明没有副作用，恢复时先核对事实，不能盲目重放。取消本身不撤销其他已存在授权，也不授予新权限。`end_session` 支持优雅退役并记录 connection_closed；直接强杀进程或 `close()` 是资源清理，不保证最后一条消息已持久化，需按未知结果恢复。
+
 ---
 
 ## 5. pending 挂起 / 跨进程恢复(审批闭环)
@@ -673,3 +679,56 @@ operation-replay guarantee, and does not introduce a new permission gate.
 Check the actual tool schema for `mode`; an older installation with the same
 candidate version string may not have it. An existence precheck followed by normal
 Write is not an equivalent no-replacement contract.
+
+## Visual specialist output budget (1.5.1-alpha.3)
+
+The synchronous `Agent` specialist `visual-ui-analysis` accepts its existing
+`prompt` and `image_paths`. The host controls its output allowance; the model
+cannot set it through Agent arguments or override the selected vision model.
+CLI processes read `CCL_VISUAL_MAX_OUTPUT_TOKENS` (default `8192`) and optional
+`CCL_VISUAL_RECOVERY_MAX_OUTPUT_TOKENS` (disabled by default). SDK hosts use the
+same variables through `options.env`:
+
+```ts
+const handle = query({
+  prompt: 'Inspect the supplied rendered slides with the visual specialist.',
+  options: {
+    env: {
+      CCL_VISUAL_MAX_OUTPUT_TOKENS: '16384',
+      CCL_VISUAL_RECOVERY_MAX_OUTPUT_TOKENS: '32768',
+    },
+    // Supply your normal cwd, credentials and permission callback as appropriate.
+  },
+})
+```
+
+Values must be decimal positive safe integers; the recovery value must exceed
+the initial value. Invalid configuration fails before image reads or model I/O.
+The existing provider/configured output limits and shared context budget still
+cap each request. Unknown limits remain unknown; a larger allowance is not a
+claim that the model supports it. Reasoning and visible text share the allowance.
+
+A terminal output-limit failure can use the higher allowance once, only when
+its effective budget increases. If a model caps both requests at 8192, no recovery
+request is sent. Recovery reuses the selected model, protocol, prompt and already
+authorized image bytes. It shares one content retry with normal-terminal empty
+response recovery. A capability-context refresh is separately allowed once before
+content recovery, so at most three inference attempts share one 900-second
+operation deadline. Cancellation, refusal, filtering, incomplete streams and an
+exhausted recovery do not trigger a further content retry.
+
+The returned visual facts retain every attempt's request ID, requested and
+effective budget, safe `requestBudget` limit snapshot, duration, and one-based
+`retryOfAttempt` / `retryOfRequestId` links. Both completed and failed inspections
+include `visualDiagnostics.usage`, `usageComplete`, and total `durationMs` (from
+post-image-load resolution to terminal outcome). `usageComplete` concerns reported
+input/output counts; optional cache breakdowns may be absent. Missing usage is
+not proof of zero cost: totals sum known values, and `usageComplete: false` marks
+the incomplete accounting. Successful SDK tool usage retains the same numeric
+totals for compatibility. A final failure remains an incomplete inspection,
+preserves earlier failures, and asks the Owner to stop same-condition retries.
+
+Increasing output allowance can increase cost and does not establish visual
+accuracy. Verify page observations separately; a complete response alone is not
+business acceptance. These variables require a build containing this feature;
+the previously published alpha.2 does not support them.