@eddyskywalker/dsh-chatgpt-subscription 0.58.0 → 0.59.0

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## Unreleased
 
+## 0.59.0 - 2026-11-06
+
+- **[codemode] 程序内的每条子调用重新写回会话：界面能看见「启动了哪个工具」**
+  - **缺的是什么**：内核的 PTC 传输会为每条子调用 append `tool/ptc-dispatch-start` / `tool/ptc-dispatch`，界面（`tool-call-tree`）靠这一对事件把子调用画到父调用下面；本行的程序交给内核运行时执行，而那两条事件不在运行时的对外契约里，于是 Code Mode 会话里回放事件**一条都没有**（实测 26 条 `tool/call` 对 0 条 `tool/ptc-dispatch*`），一次程序在界面上只有「一行日志 + 一具黑盒」。
+  - **补法**：[`src/host/codemode/transport.ts`](src/host/codemode/transport.ts) 新增 `createDispatchLog`，在子调用**真正进入执行 lane 之后**写 start、结算时写 settle，字段（`rootCallId` / `parentCallId` / `subCallId` / `name` / `arguments`）与内核逐字对齐；`subCallId` 沿用既有的 `<父>:ptc:<n>` 命名，因此 `isNestedCall` 与界面两侧都不用改。
+  - **时序诚实**：写调用受互斥闸门串行化，start 记在 lane 里而不是提交时——排队中被放弃的调用一条都不写（与内核「调度器真的开始才记」一致），并发时的顺序不会撒谎。
+  - **成对且有界**：失败也写 settle（带 `isError` 与 `error` 身份），只写 start 会留下永远不收尾的行；回放副本的单个文本块截到 8000 字符，程序本身拿到的值不受影响。
+  - **不碰程序**：`entry-codemode.ts` 的 `callTool` 只是**多回传** `content` / `meta` / `error.info`，`value` / `text` 语义不变；append 异常一律吞掉，老代 harness 没有这两种事件时降级为「没有回放」，而不是 `code_run` 失败。
+  - **验证**：`test/codemode.test.ts` 新增 5 项（成对写入与 id 对齐 / 失败收尾 / 并发时序 / append 抛错降级 / 无会话时静默）；把 start 或 settle 各抹掉一处，各有 3 项转红。
+
+- **[preset] `dispatch`（调度模式）改用 Code Mode，替代 PTC 呈现**
+  - 新增本包子入口 `./codemode`（`src/entry-codemode.ts` + `src/host/codemode/*`）：预设自身注册的工具保持原生可调，预设清单以外的工具（MCP、profile 级插件、按 agent 注册的工具集）不进入模型上下文，只能在 `code_run` 程序中通过 `code_tools_list` / `code_tools_search` / `code_tools_describe` 发现后调用。
+  - 遮蔽接缝是 per-scope `ctx.tools.setExecutor()`（0.2.2+）：`describe()` 决定请求面，`execute()` 在派发前拒绝模型直呼被遮蔽的名字并给出发现指引；程序内子调用整批委托给内核原生 executor，保留完整策略 / 审批 / post-execute 管线。
+  - **kimi-code 缓存前提**：说明段恒定（无计数、无 namespace 清单）；`code_run` 与 `run_code` 同等享受 `ref://` 大输出预览与 `cache_warmup_result` 精确补读。
+  - 代次降级：解析不到 `@deepseek-ai/dsh-tool-executor-native` 时自动退回 `tool-executor-ptc`（或更早的 `agent-tool-presentation`），旧代行为不变。
+  - 依赖：新增 `@deepseek-ai/dsh-tool-executor-native`（真实依赖；profile 插件解析不到宿主内核包）。已知限制：不提供程序级 `sandbox_permissions` 升级。（原先还写着「程序内子调用不写回放事件」，该限制已由 0.59.0 的 `createDispatchLog` 解除，见上一条。）
+
 ## 0.58.0 - 2026-11-04
 
 - **[harness] 支持 DSH 0.2.2-rc.1，并保留 0.2.2-alpha.3、latest 0.2.1-rc.5 与旧代兼容**

package/lib/client.js

@@ -155,13 +155,41 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/client/CodexImageToolView.tsx
+		/**
+		* Aspect ratios the Gemini image tool accepts in its `aspectRatio` argument.
+		*
+		* Mirrors `ANTIGRAVITY_IMAGE_ASPECT_RATIOS` in the host tool schema. The card
+		* only *sizes a placeholder* with it, so a drift here degrades to the default
+		* square instead of producing a wrong request — the value is never sent
+		* anywhere, and the host enum stays the single authority over what is legal.
+		*/
+		const IMAGE_ASPECT_RATIOS = /* @__PURE__ */ new Set([
+			"1:1",
+			"2:3",
+			"3:2",
+			"3:4",
+			"4:3",
+			"4:5",
+			"5:4",
+			"9:16",
+			"16:9",
+			"21:9",
+			"1:4",
+			"4:1",
+			"1:8",
+			"8:1"
+		]);
+		/** The model picks its own shape when the call names no ratio; the card guesses square. */
+		const DEFAULT_IMAGE_ASPECT_RATIO = "1:1";
+		/** The tray's short side, in px: a hint of the frame, not a billboard. */
+		const PLACEHOLDER_SHORT_SIDE = 112;
 		function CodexImageToolView({ block, loadImage, t }) {
 			const settled = "kind" in block;
 			const isError = settled ? block.isError : false;
-			const prompt = promptFromBlock$1(block);
 			const images = settled && !isError ? imageBlocks(block.content) : [];
 			const label = isError ? t("imageToolFailed") : settled ? t("imageToolDone") : t("imageToolRunning");
-			const summary = prompt ?? textSummary$1(settled ? block.content : []);
+			const summary = promptFromBlock$1(block) ?? textSummary$1(settled ? block.content : []);
+			const tray = settled ? null : placeholderTray(aspectRatioFromBlock(block));
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "dsh-codex-image-tool",
 				"data-state": isError ? "error" : settled ? "done" : "running",
@@ -174,12 +202,15 @@ window.__ModuleLoader__.load({
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: "dsh-codex-image-title",
+							role: "status",
+							"aria-live": "polite",
 							children: label
 						}),
-						summary !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						summary === null ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: "dsh-codex-image-summary",
+							title: summary,
 							children: summary
-						}) : null
+						})
 					]
 				}), images.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 					className: "dsh-codex-image-grid",
@@ -189,7 +220,19 @@ window.__ModuleLoader__.load({
 						label: attachment.name ?? t("image"),
 						t
 					}, String(attachment.attachmentId)))
-				}) : null]
+				}) : tray === null ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: "dsh-codex-image-grid",
+					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-codex-image-placeholder",
+						"data-ratio": tray.ratio,
+						"data-short-side": tray.axis,
+						style: {
+							aspectRatio: tray.ratio.replace(":", " / "),
+							...tray.size
+						},
+						"aria-hidden": "true"
+					})
+				})]
 			});
 		}
 		function GeneratedImage({ attachment, load, label, t }) {
@@ -223,24 +266,64 @@ window.__ModuleLoader__.load({
 			});
 		}
 		function promptFromBlock$1(block) {
-			const partial = partialPromptFromBlock(block);
+			return argumentFromBlock(block, "prompt");
+		}
+		/**
+		* Size the tray from one short side and let the ratio derive the other.
+		*
+		* A portrait frame fixes its height, and its width then stays narrow on its own.
+		* A landscape frame — and the 4:1 / 8:1 strips are exactly the case that forced
+		* this — fixes its width instead: deriving an 8:1 width from a 112px height
+		* would be 896px, which `max-width` would then clamp into a near-square box and
+		* the strip would stop looking like a strip. `min(…, 100%)` hands a narrow
+		* column back to the card and the height shrinks with it, so the shape survives
+		* the clamp.
+		*/
+		function placeholderTray(ratio) {
+			const [w, h] = ratio.split(":").map(Number);
+			return w !== void 0 && h !== void 0 && w >= h ? {
+				axis: "width",
+				ratio,
+				size: { width: `min(${Math.round(PLACEHOLDER_SHORT_SIDE * (w / h))}px, 100%)` }
+			} : {
+				axis: "height",
+				ratio,
+				size: { height: PLACEHOLDER_SHORT_SIDE }
+			};
+		}
+		/** The placeholder's shape: the call's own ratio when it is one the tool accepts. */
+		function aspectRatioFromBlock(block) {
+			const ratio = argumentFromBlock(block, "aspectRatio")?.trim();
+			return ratio !== void 0 && IMAGE_ASPECT_RATIOS.has(ratio) ? ratio : DEFAULT_IMAGE_ASPECT_RATIO;
+		}
+		/**
+		* One string argument, read from whichever shape the current stage carries.
+		*
+		* While the arguments are still streaming, the harness hands over a lazy view
+		* instead of the JSON, so `args.text(key)` is tried first; once they are
+		* complete the same argument comes back as `argsRaw`.
+		*/
+		function argumentFromBlock(block, key) {
+			const partial = partialArgumentFromBlock(block, key);
 			if (partial !== null) return partial;
 			const raw = "kind" in block ? block.call?.argsRaw : dispatchedArgsRaw(block);
 			if (typeof raw !== "string" || raw.trim() === "") return null;
 			try {
 				const value = JSON.parse(raw);
-				return typeof value === "object" && value !== null && !Array.isArray(value) && typeof value.prompt === "string" ? value.prompt : null;
+				if (typeof value !== "object" || value === null || Array.isArray(value)) return null;
+				const found = value[key];
+				return typeof found === "string" ? found : null;
 			} catch {
 				return null;
 			}
 		}
-		function partialPromptFromBlock(block) {
+		function partialArgumentFromBlock(block, key) {
 			if (!("args" in block)) return null;
 			const args = block.args;
 			if (typeof args?.text !== "function") return null;
 			try {
-				const prompt = args.text.call(args, "prompt");
-				return typeof prompt === "string" ? prompt : null;
+				const value = args.text.call(args, key);
+				return typeof value === "string" ? value : null;
 			} catch {
 				return null;
 			}
@@ -23564,18 +23647,32 @@ window.__ModuleLoader__.load({
 .dsh-codex-composer-quota[data-level=warning] strong{color:var(--dsw-alias-label-warning,#d58a24)}
 .dsh-codex-composer-quota[data-level=danger] strong{color:var(--dsw-alias-label-danger,#d94b4b)}
 .dsh-codex-image-tool{border:0.5px solid var(--dsw-alias-border-l2);border-radius:8px;display:flex;flex-direction:column;gap:8px;margin:4px 0 4px 4px;max-width:520px;padding:10px 12px}
-.dsh-codex-image-tool-head{align-items:center;display:flex;font-size:13px;gap:8px;min-width:0}
+/* One line, always. In a 320px column the label used to be squeezed until it
+   stacked one character per row, which reads as broken text rather than a card.
+   The dot and the label therefore keep their own size (flex:none + nowrap) and
+   the summary is the only thing that gives way — it shrinks to zero width and
+   ellipsizes, with the full prompt left in its title attribute. */
+.dsh-codex-image-tool-head{align-items:center;display:flex;flex-wrap:nowrap;font-size:13px;gap:8px;min-width:0}
 .dsh-codex-image-dot{background:var(--dsw-alias-button-info-fill,#397ee8);border-radius:50%;corner-shape:round;display:inline-block;flex:none;height:8px;width:8px}
 .dsh-codex-image-tool[data-state=error] .dsh-codex-image-dot{background:var(--dsw-alias-label-danger,#d94b4b)}
-.dsh-codex-image-title{font-weight:600}
-.dsh-codex-image-summary{color:var(--dsw-alias-label-tertiary);min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.dsh-codex-image-title{flex:none;font-weight:600;white-space:nowrap}
+.dsh-codex-image-summary{color:var(--dsw-alias-label-tertiary);flex:1 1 auto;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .dsh-codex-image-grid{display:flex;flex-wrap:wrap;gap:8px}
+/* The tray the image will land in, drawn while the call is still running so the
+   card does not jump from one text row to a full picture when the result
+   arrives. Neither dimension is set here: the view fixes the short side (height
+   for a portrait frame, width for a landscape one) and the inline aspect-ratio
+   derives the other, which is what keeps the 4:1 and 8:1 strips from being
+   clamped into squarer boxes. max-width is the card's edge. The breathe is the
+   same restrained opacity pulse the settings skeleton uses, and the
+   reduced-motion block below turns it off. */
+.dsh-codex-image-placeholder{animation:dsh-codex-pulse 2s ease-in-out infinite;background:var(--dsw-alias-bg-layer-2);border:0.5px dashed var(--dsw-alias-border-l2);border-radius:8px;display:block;flex:none;max-width:100%}
 .dsh-codex-image-preview{background:var(--dsw-alias-bg-layer-2);border:0.5px solid var(--dsw-alias-border-l2);border-radius:8px;display:block;max-height:260px;max-width:min(100%,360px);object-fit:contain}
 .dsh-codex-image-loading,.dsh-codex-image-failed{border:0.5px dashed var(--dsw-alias-border-l2);border-radius:8px;color:var(--dsw-alias-label-tertiary);display:inline-flex;font-size:12px;line-height:1.4;padding:18px 20px}
 .dsh-codex-image-failed{color:var(--dsw-alias-label-danger,#d94b4b)}
 @keyframes dsh-codex-pulse{0%,100%{opacity:.45}50%{opacity:.85}}
 @media(max-width:560px){.dsh-codex-row,.dsh-codex-pref-row,.dsh-codex-quota-fact,.dsh-codex-reset-credits{align-items:flex-start;flex-direction:column;gap:3px}.dsh-codex-value,.dsh-codex-quota-fact strong{text-align:left}.dsh-codex-actions{justify-content:flex-start}.dsh-codex-grouphead{align-items:flex-start;flex-direction:column;gap:0;padding:12px 0}.dsh-codex-meter-meta{align-items:flex-start;flex-direction:column;gap:2px}.dsh-codex-errorbar{align-items:flex-start;flex-direction:column}.dsh-codex-segments{width:100%}.dsh-codex-select{max-width:none;width:100%}.dsh-codex-context-row{align-items:flex-start;flex-direction:column;gap:5px}.dsh-codex-segments label{flex:1}.dsh-codex-segments span{text-align:center}.dsh-codex-image-tool{max-width:100%;margin-left:0}}
-@media(prefers-reduced-motion:reduce){.dsh-codex-meter>span{transition:none}.dsh-codex-skeleton span{animation:none}}
+@media(prefers-reduced-motion:reduce){.dsh-codex-meter>span{transition:none}.dsh-codex-skeleton span{animation:none}.dsh-codex-image-placeholder{animation:none}}
 `;
 		/**
 		* Install the ChatGPT tab's stylesheet as a document-owned, never-removed
@@ -54970,22 +55067,36 @@ window.__ModuleLoader__.load({
 			done: "rowDone",
 			error: "rowError"
 		};
-		/** 行的外框样式。 */
+		/**
+		* 行的外框样式。
+		*
+		* 字号与官方工具行标题对齐（13px）：同一条时间线上混着 12px 的进展行与 13px 的
+		* 工具行，读者看到的是两套字号。
+		*/
 		const rowStyle = {
 			display: "flex",
 			flexDirection: "column",
 			gap: "6px",
 			width: "100%",
-			fontSize: "12px",
+			fontSize: "13px",
 			color: "var(--dsw-alias-label-primary, #1f2329)"
 		};
-		/** 标题行按钮样式（整行可点，去掉原生按钮外观）。 */
+		/**
+		* 标题行按钮样式（整行可点，去掉原生按钮外观）。
+		*
+		* `minHeight: 36px` 与 `padding: 6px 0` 抄的是官方工具行那层 `_row_` 的实测取值
+		* （`height:36px; min-height:36px; padding:6px 0`）。少了这两个值，进展行只有
+		* 18px 左右，夹在一排 36px 的工具行里会明显更矮、更挤——用户报的就是这个。
+		* 用 minHeight 而不是 height：正文换行、标题很长时允许它撑高，官方那种固定高度
+		* 在文字折行时会把内容裁掉。
+		*/
 		const headerStyle = {
 			display: "flex",
-			alignItems: "baseline",
+			alignItems: "center",
 			gap: "8px",
 			width: "100%",
-			padding: "0",
+			minHeight: "36px",
+			padding: "6px 0",
 			border: "0",
 			background: "transparent",
 			color: "inherit",
@@ -54997,9 +55108,9 @@ window.__ModuleLoader__.load({
 		const titleStyle = {
 			flex: "1 1 auto",
 			minWidth: "0",
-			fontSize: "12px",
+			fontSize: "13px",
 			fontWeight: 500,
-			lineHeight: "1.5",
+			lineHeight: "16px",
 			overflowWrap: "anywhere"
 		};
 		/** 状态词的小字样式。 */
@@ -55012,6 +55123,8 @@ window.__ModuleLoader__.load({
 		/**
 		* 正文样式：只管外边距、字号与颜色。
 		*
+		* 字号与标题一致（13px）—— 早先正文比标题小一号，展开后两节字不同大，读起来碎。
+		*
 		* **不再**在这里写 `whiteSpace: 'pre-wrap'`：正文交给 {@link MarkdownLite} 渲染，
 		* 换行该不该保留由它产出的块级元素决定。早先这里是纯文本 `<p>{message}</p>`，
 		* 于是列表符号、`**粗体**` 和管道符表格全部原样上屏 —— 同一份进展在侧栏面板里
@@ -55020,8 +55133,8 @@ window.__ModuleLoader__.load({
 		const messageStyle = {
 			overflowWrap: "anywhere",
 			margin: "0",
-			fontSize: "12px",
-			lineHeight: "1.55",
+			fontSize: "13px",
+			lineHeight: "1.6",
 			color: "var(--dsw-alias-label-secondary, #5b6270)"
 		};
 		/**