@toddzheng024/dscode-bundle 0.7.26 → 0.7.28

package/vendor/subagent-core/types/projection.js

@@ -14,15 +14,18 @@ const activeIntervalSchema = z.object({
 const projectionSchema = z.object({
     settledMs: z.number().int().nonnegative(),
     active: activeIntervalSchema.optional(),
-}).strict().transform(({ settledMs, active }) => ({
+    lastTurnCompleted: z.boolean().optional(),
+}).strict().transform(({ settledMs, active, lastTurnCompleted }) => ({
     settledMs,
     ...active === undefined ? {} : { active },
+    ...lastTurnCompleted === undefined ? {} : { lastTurnCompleted },
 }));
 const timingStateSchema = z.object({
     settledMs: z.number().int().nonnegative(),
     active: activeIntervalSchema.optional(),
     pendingTurnStart: z.number().int().nonnegative().optional(),
     descriptorSeen: z.boolean(),
+    lastTurnCompleted: z.boolean().optional(),
 }).strict();
 /**
  * Fold turn boundaries around the child's own durable descriptor.
@@ -38,9 +41,10 @@ export const subagentTimingProjectionDefinition = {
     init: () => ({ descriptorSeen: false, settledMs: 0 }),
     apply: (state, event) => {
         if (event.type === 'turn/start') {
+            const { lastTurnCompleted: _closed, ...openState } = state;
             return state.descriptorSeen
-                ? { ...state, active: { since: event.time, through: event.time } }
-                : { ...state, pendingTurnStart: event.time };
+                ? { ...openState, active: { since: event.time, through: event.time } }
+                : { ...openState, pendingTurnStart: event.time };
         }
         if (event.type === 'subagent/descriptor') {
             const activeSince = state.active?.since ?? state.pendingTurnStart;
@@ -65,6 +69,7 @@ export const subagentTimingProjectionDefinition = {
             return {
                 ...rest,
                 settledMs: state.settledMs + Math.max(0, event.time - active.since),
+                lastTurnCompleted: event.data.reason.kind === 'completed',
             };
         }
         if (state.active === undefined)
@@ -76,9 +81,10 @@ export const subagentTimingProjectionDefinition = {
         view: state => ({
             settledMs: state.settledMs,
             ...(state.active === undefined ? {} : { active: state.active }),
+            ...(state.lastTurnCompleted === undefined ? {} : { lastTurnCompleted: state.lastTurnCompleted }),
         }),
     },
-    stateVersion: 2,
+    stateVersion: 3,
 };
 // The cast bridges only the optional-label arm: Zod's optional output
 // includes explicit `undefined`, which exactOptionalPropertyTypes excludes

package/vendor/subagent-core/types/run-settlement.js

@@ -30,7 +30,7 @@ function failureDetail(result) {
 function runOutcome(result) {
     switch (result.stopReason) {
         case 'completed':
-            return { status: 'completed', output: finalText(result.output) };
+            return { status: 'completed', result: finalText(result.output) };
         case 'aborted':
             return result.diagnostic === undefined
                 ? { status: 'killed' }

package/vendor/subagent-core/types/types.d.ts

@@ -106,7 +106,7 @@ export interface SubagentRunEndInfo {
      * {@link SubagentResult.output}; absent on infrastructure rejection or when
      * the child produced none.
      */
-    readonly lastAssistantMessage?: ContentBlock[];
+    readonly lastAssistantMessage?: readonly ContentBlock[];
 }
 /**
  * Which START-TIME features a provider supports. Checked by the service before delegating to
@@ -260,7 +260,7 @@ export interface SubagentResult {
      * are skipped. Without a non-empty message, the output is its accumulated
      * assistant text stream, or `[]` when the child produced neither.
      */
-    readonly output: ContentBlock[];
+    readonly output: readonly ContentBlock[];
     /**
      * The structured result after a requested `outputSchema` was successfully
      * satisfied. Requesting a schema does not guarantee presence: a provider can

package/vendor/terminal/index.js

@@ -1,10 +1,10 @@
 // dscode-shell-capture-v1
 // dscode-no-history-expansion-v1
-import { createRequire } from "node:module";
 import { TerminalBackendCleanupError, TerminalError } from "@deepseek-ai/dsh-terminal";
 import { ENCODING_PREAMBLE, resolvePwshPath } from "@deepseek-ai/dsh-pwsh-local";
 import z from "@deepseek-ai/schemastery";
 import { Buffer } from "node:buffer";
+import { createLazyRequire } from "@deepseek-ai/dsh-lazy-require";
 //#region lib/types/config.js
 /** Validated configuration for the local PTY backend. */
 /** Bash dialect default executable. */
@@ -235,7 +235,7 @@ function normalizeTerminalText(text) {
 //#endregion
 //#region lib/types/session.js
 /** Persistent PTY session with bounded output, readiness, and terminal-protocol replies. */
-const { Terminal: HeadlessTerminal } = createRequire(import.meta.url)("@xterm/headless");
+const requireHeadless = createLazyRequire("@xterm/headless", import.meta.url);
 function utf8Tail(text, maxBytes) {
 	if (Buffer.byteLength(text) <= maxBytes) return {
 		text,
@@ -255,34 +255,84 @@ function utf8Tail(text, maxBytes) {
 		truncated: true
 	};
 }
+const COALESCED_CHUNK_UNITS = 4096;
+/** Retention work is amortized over appended text; reads assemble the retained chunks. */
 const CAPTURE_MAX_BYTES = 4194304;
 var BoundedTextBuffer = class {
 	maxBytes;
 	maxLines;
-	value = "";
+	head;
+	tail;
+	bytes = 0;
+	newlines = 0;
+	lastCodeUnit = 0;
 	dropped = false;
 	constructor(maxBytes, maxLines) {
 		this.maxBytes = maxBytes;
 		this.maxLines = maxLines;
 	}
+	get truncated() {
+		return this.dropped;
+	}
+	get isEmpty() {
+		return this.head === void 0;
+	}
 	append(text) {
 		if (text.length === 0) return;
-		this.value += text;
-		if (this.maxLines !== void 0) {
-			const lines = this.value.split("\n");
-			if (lines.length > this.maxLines) {
-				this.value = lines.slice(lines.length - this.maxLines).join("\n");
-				this.dropped = true;
-			}
+		text = Buffer.from(text, "utf16le").toString("utf16le");
+		this.bytes += Buffer.byteLength(text);
+		const tail = this.tail;
+		if (tail !== void 0) {
+			const last = this.lastCodeUnit;
+			const first = text.charCodeAt(0);
+			if (last >= 55296 && last <= 56319 && first >= 56320 && first <= 57343) this.bytes -= 2;
+		}
+		for (let index = text.indexOf("\n"); index !== -1; index = text.indexOf("\n", index + 1)) this.newlines += 1;
+		this.lastCodeUnit = text.charCodeAt(text.length - 1);
+		if (tail !== void 0 && tail !== this.head && tail.text.length + text.length <= COALESCED_CHUNK_UNITS) tail.text += text;
+		else {
+			if (tail !== void 0 && tail.text.length <= COALESCED_CHUNK_UNITS) tail.text = Buffer.from(tail.text, "utf16le").toString("utf16le");
+			const chunk = {
+				text,
+				start: 0,
+				next: void 0
+			};
+			if (tail === void 0) this.head = chunk;
+			else tail.next = chunk;
+			this.tail = chunk;
+		}
+		while (this.head !== void 0 && (this.bytes > this.maxBytes || this.maxLines !== void 0 && this.newlines >= this.maxLines)) {
+			const head = this.head;
+			const first = head.text.charCodeAt(head.start);
+			const second = head.start + 1 < head.text.length ? head.text.charCodeAt(head.start + 1) : head.next?.text.charCodeAt(0);
+			const paired = first >= 55296 && first <= 56319 && second !== void 0 && second >= 56320 && second <= 57343;
+			this.bytes -= paired ? 4 : first < 128 ? 1 : first < 2048 ? 2 : 3;
+			if (first === 10) this.newlines -= 1;
+			this.advance(paired ? 2 : 1);
+			this.dropped = true;
+		}
+		const head = this.head;
+		if (head !== void 0 && head.start >= head.text.length / 2) {
+			head.text = Buffer.from(head.text.slice(head.start), "utf16le").toString("utf16le");
+			head.start = 0;
+		}
+	}
+	advance(units) {
+		while (units > 0 && this.head !== void 0) {
+			const head = this.head;
+			const count = Math.min(units, head.text.length - head.start);
+			head.start += count;
+			units -= count;
+			if (head.start === head.text.length) this.head = head.next;
 		}
-		const tail = utf8Tail(this.value, this.maxBytes);
-		this.value = tail.text;
-		this.dropped ||= tail.truncated;
+		if (this.head === void 0) this.tail = void 0;
 	}
 	consume() {
-		const delta = this.value;
-		const truncated = this.dropped;
-		this.value = "";
+		const { text: delta, truncated } = this.snapshot();
+		this.head = void 0;
+		this.tail = void 0;
+		this.bytes = 0;
+		this.newlines = 0;
 		this.dropped = false;
 		return {
 			delta,
@@ -290,8 +340,10 @@ var BoundedTextBuffer = class {
 		};
 	}
 	snapshot() {
+		const chunks = [];
+		for (let chunk = this.head; chunk !== void 0; chunk = chunk.next) chunks.push(chunk.text.slice(chunk.start));
 		return {
-			text: this.value,
+			text: chunks.join(""),
 			truncated: this.dropped
 		};
 	}
@@ -402,6 +454,7 @@ var LocalPtySession = class {
 		this.terminal = terminal;
 		this.config = config;
 		this.pid = terminal.pid;
+		const { Terminal: HeadlessTerminal } = requireHeadless();
 		this.emulator = new HeadlessTerminal({
 			cols: config.cols,
 			rows: config.rows,
@@ -661,7 +714,7 @@ var LocalPtySession = class {
 				return;
 			}
 			const elapsed = Date.now() - operation.startedAt;
-			const startupHasOutput = !this.initializing || this.scrollback.snapshot().text.length > 0;
+			const startupHasOutput = !this.initializing || !this.scrollback.isEmpty;
 			const acceptsStdinWait = startupHasOutput && foreground !== void 0 && operation.acceptsStdinWait(foreground.processGroupId, foreground.inputWaiting);
 			if (elapsed >= this.config.exactProbeAfterMs && acceptsStdinWait) {
 				this.settleActive("stdin_read");
@@ -766,7 +819,7 @@ var LocalPtySession = class {
 	settleActive(waitReason, retainOwnership = false) {
 		const operation = this.active;
 		if (operation === void 0) return;
-		const scrollbackTruncated = this.scrollback.snapshot().truncated;
+		const scrollbackTruncated = this.scrollback.truncated;
 		if (retainOwnership) {
 			this.stopPolling();
 			this.activeAbort?.();
@@ -905,15 +958,15 @@ function childEnvironment(spec, dialect) {
 * input are unreliable under PSReadLine.
 */
 const PWSH_PROMPT_SETUP = "function prompt { [Console]::Write([char]27 + ']133;D;' + [int]$LASTEXITCODE + [char]7); 'dsh> ' }";
-function spawnArgv(ctx, config, policy) {
+async function spawnArgv(ctx, config, policy, signal) {
 	const argv = [config.shellPath, ...config.shellArgs];
 	if (policy.mode === "danger-full-access") return argv;
 	const sandbox = ctx.get("sandbox");
 	if (sandbox === void 0) throw new Error(`terminal-bash: sandbox mode "${policy.mode}" requires a ctx.sandbox provider in the execution world`);
-	return sandbox.confine(argv, {
+	return (await sandbox.confine(argv, {
 		...policy,
 		mode: policy.mode
-	}).argv;
+	}, signal)).argv;
 }
 async function startupSession(session, dialect, timeoutMs, signal) {
 	let startupOperation;
@@ -965,6 +1018,15 @@ async function startupSession(session, dialect, timeoutMs, signal) {
 		if (signal !== void 0 && onAbort !== void 0) signal.removeEventListener("abort", onAbort);
 	}
 }
+/** Reject a failed startup only after its unpublished resources reach quiescence. */
+async function rejectAfterStartupCleanup(error, cleanup) {
+	try {
+		await cleanup();
+	} catch (cleanupError) {
+		throw new TerminalBackendCleanupError(error, cleanupError);
+	}
+	throw error;
+}
 /** Local shell backend registered under the configured type. */
 var BashTerminalBackend = class {
 	ctx;
@@ -983,7 +1045,8 @@ var BashTerminalBackend = class {
 		spec.signal?.throwIfAborted();
 		ensureSandboxModeFence(this.ctx, spec.owner);
 		const policy = this.ctx.sandboxPolicy.resolve({ session: spec.owner.session });
-		const argv = spawnArgv(this.ctx, this.config, policy);
+		const argv = await spawnArgv(this.ctx, this.config, policy, spec.signal);
+		spec.signal?.throwIfAborted();
 		if (argv[0] === void 0) throw new Error("terminal-bash: sandbox returned empty argv");
 		const terminal = await this.spawnTerminal({
 			argv,
@@ -991,20 +1054,21 @@ var BashTerminalBackend = class {
 			env: childEnvironment(spec, this.config.shellDialect),
 			rows: this.config.rows,
 			cols: this.config.cols,
+			terminalType: "dumb",
 			graceMs: this.config.disposeGraceMs,
 			signal: spec.signal
 		});
-		const session = this.createSession(terminal, this.config);
+		let session;
+		try {
+			session = this.createSession(terminal, this.config);
+		} catch (error) {
+			return rejectAfterStartupCleanup(error, () => terminal.terminate());
+		}
 		try {
 			await startupSession(session, this.config.shellDialect, this.config.timeoutMs, spec.signal);
 			return session;
 		} catch (error) {
-			try {
-				await session.close("PTY startup failed");
-			} catch (closeError) {
-				throw new TerminalBackendCleanupError(error, closeError);
-			}
-			throw error;
+			return rejectAfterStartupCleanup(error, () => session.close("PTY startup failed"));
 		}
 	}
 };

package/vendor/tui/lib/index.mjs

@@ -96,7 +96,8 @@ function listJobs(ctx, caller) {
     if (jobs === undefined)
         return [];
     try {
-        return jobs.list(caller).map((job) => ({
+        // DSH 0.1.7 fences jobs by the owning session id rather than the calling Agent.
+        return jobs.list(caller?.session.id).map((job) => ({
             id: job.id,
             kind: job.kind,
             label: job.label,

package/vendor/tui/lib/kernel-panels.mjs

@@ -120,7 +120,7 @@ export function ModePanel({ current, load, select, close }) {
     });
     return createElement(ListFrame, {
         title: t('panel.mode.title', { current }),
-        rows: visible.map(row => ({ key: row.id, disabled: row.broken !== undefined, text: `${row.id === current ? '●' : '○'} ${row.name ?? row.id} · ${row.description ?? row.trust}${row.broken === undefined ? '' : ` · broken: ${row.broken}`}` })),
+        rows: visible.map(row => ({ key: row.id, disabled: row.broken !== undefined, text: `${row.id === current ? '●' : '○'} ${row.name ?? row.id} · ${row.description ?? row.id}${row.broken === undefined ? '' : ` · broken: ${row.broken}`}` })),
         cursor, loading, error, query, footer: t('panel.footer.chooseSwitch'),
     });
 }

package/vendor/tui/lib/render/projection.mjs

@@ -123,10 +123,29 @@ export function nextEveryTarget(previousTarget, acceptedAt, everySeconds) {
     const missed = Math.ceil((acceptedAt - previousTarget + 1) / interval);
     return previousTarget + missed * interval;
 }
-/** Plugin snapshot sources folded into token stats but never rendered as rows. */
-const HIDDEN_SNAPSHOT_PLUGINS = new Set(['time-context', 'tmux-context', 'dscode-time-marks']);
-/** Plugin prompt sources rendered as full user rows (they ARE the conversation). */
-const REMINDER_PLUGINS = new Set(['schedule']);
+/** Snapshot producers folded into token stats but never rendered as rows. */
+const HIDDEN_SNAPSHOT_KINDS = new Set(['time-context', 'tmux-context', 'dscode-time-marks']);
+/** Producers whose prompts are rendered as full user rows (they ARE the conversation). */
+const REMINDER_KINDS = new Set(['schedule']);
+/**
+ * The producing subsystem behind one message source.
+ *
+ * DSH 0.1.7 retired the shared `plugin` kind: every producer declares its own `kind`.
+ * A resumed transcript also carries the two older shapes — the raw
+ * `{ kind: 'plugin', plugin: '<producer>' }` of a session written before the upgrade and
+ * the `plugin:<producer>` kind the v3-to-v4 session migration writes for a producer it
+ * does not know — so every rule below asks this function instead of the raw kind.
+ */
+function producerKind(source) {
+    const legacy = source;
+    if (legacy.kind === 'plugin')
+        return legacy.plugin ?? '';
+    return source.kind.startsWith('plugin:') ? source.kind.slice('plugin:'.length) : source.kind;
+}
+/** One-line account a `notice`-form context committed, when it carries one. */
+function noticeSummary(source) {
+    return 'form' in source && source.form === 'notice' ? source.summary : undefined;
+}
 /** Assemble the effective system prompt from surface nodes: head text plus every later non-empty node. */
 function assembleSystemPrompt(nodes) {
     if (nodes.size === 0)
@@ -358,7 +377,7 @@ export function projectEvent(view, event) {
             // Snapshot injections (time/tmux context) still spend model context but
             // render nothing; the schedule reminder is a real prompt and renders in
             // full — the model acts on it, so the transcript must show it.
-            if (message.source.kind === 'plugin' && HIDDEN_SNAPSHOT_PLUGINS.has(message.source.plugin)) {
+            if (HIDDEN_SNAPSHOT_KINDS.has(producerKind(message.source))) {
                 return {
                     ...view,
                     pending,
@@ -373,7 +392,7 @@ export function projectEvent(view, event) {
                     },
                 };
             }
-            if (message.source.kind === 'plugin' && REMINDER_PLUGINS.has(message.source.plugin)) {
+            if (REMINDER_KINDS.has(producerKind(message.source))) {
                 return {
                     ...view,
                     pending,
@@ -388,11 +407,7 @@ export function projectEvent(view, event) {
                     },
                 };
             }
-            const notice = message.source.kind === 'plugin' && message.source.form === 'notice'
-                ? message.source.summary
-                : message.source.kind === 'plugin'
-                    ? message.source.plugin
-                    : message.source.kind;
+            const notice = noticeSummary(message.source) ?? producerKind(message.source);
             const summary = boundContextSummary(notice);
             return {
                 ...view,
@@ -625,18 +640,20 @@ export function projectEvent(view, event) {
             };
         }
         case 'tool/result': {
-            const block = event.data.message.content[0];
-            const started = view.anchors.toolStart.get(block.toolCallId);
-            view.anchors.toolStart.delete(block.toolCallId);
+            // DSH 0.1.7 moved the answered call id, the error flag and the result text from
+            // the first content block onto the tool-result message itself.
+            const result = event.data.message;
+            const started = view.anchors.toolStart.get(result.toolCallId);
+            view.anchors.toolStart.delete(result.toolCallId);
             // Deregister the call from its turn's registry so `turn/end` does not
             // sweep a start that already paired with a result.
             const turnTools = view.anchors.turnTools.get(event.data.turn);
             if (turnTools !== undefined) {
-                turnTools.delete(block.toolCallId);
+                turnTools.delete(result.toolCallId);
                 if (turnTools.size === 0)
                     view.anchors.turnTools.delete(event.data.turn);
             }
-            const rawText = textOf(block.content);
+            const rawText = textOf(result.content);
             const summary = boundContextSummary(rawText);
             // The verbose expansion self-serves from the persisted presentation
             // metadata (diffs, read windows, web sources) with the bounded raw text
@@ -650,9 +667,9 @@ export function projectEvent(view, event) {
                 view.anchors.turnFiles.set(event.data.turn, set);
             }
             const entries = view.entries.map((entry) => {
-                if (entry.kind !== 'tool' || entry.callId !== block.toolCallId)
+                if (entry.kind !== 'tool' || entry.callId !== result.toolCallId)
                     return entry;
-                return { ...entry, state: block.isError === true ? 'error' : 'done', summary, detail };
+                return { ...entry, state: result.isError === true ? 'error' : 'done', summary, detail };
             });
             return {
                 ...view,
@@ -1172,7 +1189,7 @@ export function replayProjectEvent(acc, event) {
             const origin = acc.claimOrigin.get(message.id);
             const delivery = origin === undefined ? {} : { delivery: origin === 'next-turn' ? 'queued' : 'steered' };
             acc.claimOrigin.delete(message.id);
-            if (message.source.kind === 'user' || (message.source.kind === 'plugin' && REMINDER_PLUGINS.has(message.source.plugin))) {
+            if (message.source.kind === 'user' || REMINDER_KINDS.has(producerKind(message.source))) {
                 appendReplayEntry(acc, { kind: 'user', text, notice: false, ...delivery, ...(images.length === 0 ? {} : { images }), ...(files.length === 0 ? {} : { files }) });
                 acc.stats = {
                     ...acc.stats,
@@ -1183,7 +1200,7 @@ export function replayProjectEvent(acc, event) {
                 };
                 return true;
             }
-            if (message.source.kind === 'plugin' && HIDDEN_SNAPSHOT_PLUGINS.has(message.source.plugin)) {
+            if (HIDDEN_SNAPSHOT_KINDS.has(producerKind(message.source))) {
                 acc.stats = {
                     ...acc.stats,
                     contextSegments: {
@@ -1193,11 +1210,7 @@ export function replayProjectEvent(acc, event) {
                 };
                 return true;
             }
-            const notice = message.source.kind === 'plugin' && message.source.form === 'notice'
-                ? message.source.summary
-                : message.source.kind === 'plugin'
-                    ? message.source.plugin
-                    : message.source.kind;
+            const notice = noticeSummary(message.source) ?? producerKind(message.source);
             const summary = boundContextSummary(notice);
             appendReplayEntry(acc, { kind: 'user', text: summary, notice: true });
             acc.stats = {
@@ -1379,16 +1392,16 @@ export function replayProjectEvent(acc, event) {
             return true;
         }
         case 'tool/result': {
-            const block = event.data.message.content[0];
-            const started = acc.toolStart.get(block.toolCallId);
-            acc.toolStart.delete(block.toolCallId);
+            const result = event.data.message;
+            const started = acc.toolStart.get(result.toolCallId);
+            acc.toolStart.delete(result.toolCallId);
             const turnTools = acc.turnTools.get(event.data.turn);
             if (turnTools !== undefined) {
-                turnTools.delete(block.toolCallId);
+                turnTools.delete(result.toolCallId);
                 if (turnTools.size === 0)
                     acc.turnTools.delete(event.data.turn);
             }
-            const rawText = textOf(block.content);
+            const rawText = textOf(result.content);
             const summary = boundContextSummary(rawText);
             const detail = toolResultDetail(event.data.meta, rawText);
             if (detail?.kind === 'diff') {
@@ -1399,13 +1412,13 @@ export function replayProjectEvent(acc, event) {
             }
             const update = (entry) => ({
                 ...entry,
-                state: block.isError === true ? 'error' : 'done',
+                state: result.isError === true ? 'error' : 'done',
                 summary,
                 detail,
             });
             // Every matching row updates (duplicate callIds included); an id with no
             // registered index is a provable no-op — no full-array fallback scan.
-            updateReplayById(acc, acc.toolIndex, block.toolCallId, entry => entry.callId === block.toolCallId, update);
+            updateReplayById(acc, acc.toolIndex, result.toolCallId, entry => entry.callId === result.toolCallId, update);
             acc.stats = {
                 ...acc.stats,
                 toolMs: acc.stats.toolMs + (started === undefined ? 0 : Math.max(0, event.time - started)),
@@ -1860,10 +1873,11 @@ function dscodeCloseTurn(entries) {
     return [...entries.slice(0, -1), { ...last, turnEnded: true }];
 }
 /**
- * dscode: session-bridge relays are plugin messages that must render as visible
- * user turns (the bridge delivers a peer session's message), so the replay
- * branch admits them alongside direct human prompts.
+ * dscode: session-bridge relays are injected messages that must render as visible
+ * user turns (the bridge delivers a peer session's message), so the replay branch
+ * admits them alongside direct human prompts.
  */
 function dscodeVisibleRelay(message) {
-    return message.source.kind === 'plugin' && message.source.plugin === 'dscode-session-bridge' && message.source.form === 'relay';
+    return producerKind(message.source) === 'dscode-session-bridge'
+        && 'form' in message.source && message.source.form === 'relay';
 }