@khorsheed/dsh-local-agent-kimi 0.2.0-rc.3 → 0.2.0

package/lib/types/client/icons.d.ts

@@ -1,6 +1,6 @@
 /**
  * Generated by scripts/sync-icon-artwork.mts from @deepseek-ai/dsh-client-ui-primitives
- * (v0.1.7-rc.1, harness 46a7f68b09) — do not edit by hand. The 0.1.5 and rc.1 host lines
+ * (v0.2.1-rc.1, harness 1600d8a1e1) — do not edit by hand. The 0.1.5 and rc.1 host lines
  * share no icon export name, so the rc.1 artwork is inlined here: pure SVG,
  * no host runtime identity, identical on every line. Re-run the generator
  * after adding an icon import or bumping the harness checkout.

package/lib/types/kimi-cli-provider.js

@@ -11,7 +11,7 @@
 import { randomUUID } from 'node:crypto';
 import { SessionId } from '@deepseek-ai/dsh-session';
 import { NO_START_CAPABILITIES, SUBAGENT_DESCRIPTOR_VERSION, settleRunResult, subprocessRunHandle, } from '@deepseek-ai/dsh-subagent';
-import { assertResumeCwdUnchanged, assertResumeScopeUnchanged, resolveRoundModel, containerExecSpawn, containerScopedHome, delegationEnv, establishSubagentCatalogChild, probeCliVersion, resolveChildCwd, subagentDelegationLabel, } from '@khorsheed/dsh-local-agent';
+import { assertResumeCwdUnchanged, assertResumeScopeUnchanged, resolveRoundModel, containerExecSpawn, containerScopedHome, delegationEnv, establishSubagentCatalogChild, persistChildSession, probeCliVersion, resolveChildCwd, subagentDelegationLabel, } from '@khorsheed/dsh-local-agent';
 import { MEMBER_BRIDGE_SOCKET_ENV, MEMBER_BRIDGE_TOKEN_ENV } from '@khorsheed/dsh-local-agent/types';
 import { LiveChannelUnavailableError } from './live-driver.js';
 import { injectMemberBridge, memberBridgeServerKey, removeMemberBridge } from './member-bridge-config.js';
@@ -623,8 +623,11 @@ async function mirrorKimiAfterExit(spec, stderr) {
         // The round's turn selects which transcript lines the tool-call accounting
         // belongs to — the mirror window would under-count a settle pass a live
         // poll already drained, and over-count a resume round's earlier turns.
+        // Settle mode: calls whose result never reached the wire fold with a
+        // synthesized interrupted result instead of holding the offset forever.
         const delta = await mirrorKimiDelta(spec.ctx, spec.childSession, spec.homeDir, kimiSessionId, {
             turn: spec.resume?.turn ?? 1,
+            settle: true,
         });
         // Report the final mirrored-line count even when the live mirror already
         // advanced the offset (empty delta): the settle report is authoritative.
@@ -818,24 +821,6 @@ export async function startKimiCliRun(request, spec) {
         // or not the round is session-backed.
         if (settled.stopReason === 'completed')
             spec.onAuthSuccess?.();
-        // The turn closes at the real settle moment, so the timing projection's
-        // duration equals the actual CLI runtime. Every terminal path closes the
-        // window — a failed or cancelled run settles 'error'/'aborted' instead of
-        // leaving the turn open with a distorted tiny duration.
-        if (spec.childSession !== undefined) {
-            if (settled.stopReason === 'completed') {
-                spec.childSession.append('turn/end', { turn, reason: { kind: 'completed' } });
-            }
-            else if (settled.stopReason === 'aborted') {
-                spec.childSession.append('turn/end', { turn, reason: { kind: 'aborted', reason: { kind: 'parent' } } });
-            }
-            else {
-                spec.childSession.append('turn/end', {
-                    turn,
-                    reason: { kind: 'error', error: { message: 'kimi -p exited before the run completed', code: 'UNKNOWN' } },
-                });
-            }
-        }
         return settled;
     });
     // After the child EXITS — however it ended (completed, killed by dispose, or
@@ -843,9 +828,12 @@ export async function startKimiCliRun(request, spec) {
     // subagent session, so a cancelled round still preserves its partial work
     // and real token usage instead of leaving the child blank. The mirror reads
     // the wire file, so it only reflects what kimi flushed before the kill.
-    // Waits for the settle chain first (so turn/end is already appended) AND for
-    // the process to actually exit (so the wire file is complete) before
-    // reading it. Enqueued behind any in-flight live poll on the mirror queue.
+    // Waits for the settle chain first AND for the process to actually exit (so
+    // the wire file is complete) before reading it. Enqueued behind any
+    // in-flight live poll on the mirror queue. The turn closes AFTER the settle
+    // mirror, still inside the mirror queue: every mirrored step must land
+    // before turn/end — the released-log reader rejects a step outside an open
+    // turn on every cold read.
     void result.then(() => child.done).then(() => {
         // Auth detection runs post-exit: streams are drained by then, so a fast
         // failure's stderr is complete (a settle-time read could race the flush).
@@ -863,16 +851,41 @@ export async function startKimiCliRun(request, spec) {
         // usage into the round total, then reports the round's settled
         // observation — the wire's model plus the round's accumulated usage.
         enqueueMirror(async () => {
-            const settled = await mirrorKimiAfterExit(spec, stderr);
-            addRoundUsage(settled?.usage);
+            const settled = await result;
+            const mirrored = await mirrorKimiAfterExit(spec, stderr);
+            addRoundUsage(mirrored?.usage);
+            // The turn closes at the real settle moment, so the timing
+            // projection's duration equals the actual CLI runtime (plus the
+            // settle-mirror quiescence). Every terminal path closes the window —
+            // a failed or cancelled run settles 'error'/'aborted' instead of
+            // leaving the turn open with a distorted tiny duration.
+            if (spec.childSession !== undefined) {
+                if (settled.stopReason === 'completed') {
+                    spec.childSession.append('turn/end', { turn, reason: { kind: 'completed' } });
+                }
+                else if (settled.stopReason === 'aborted') {
+                    spec.childSession.append('turn/end', { turn, reason: { kind: 'aborted', reason: { kind: 'parent' } } });
+                }
+                else {
+                    spec.childSession.append('turn/end', {
+                        turn,
+                        reason: { kind: 'error', error: { message: 'kimi -p exited before the run completed', code: 'UNKNOWN' } },
+                    });
+                }
+                if (spec.ctx !== undefined) {
+                    await persistChildSession(spec.ctx, spec.childSession).catch((error) => {
+                        spec.ctx?.logger.warn(`subagent-kimi: turn/end persistence failed: ${thrown(error).message}`);
+                    });
+                }
+            }
             // The wire log names the model but never the CLI build, so the version
             // is the executable's own answer, probed once per binary.
             const cliVersion = await spec.cliVersion?.();
             spec.onRoundSettled?.({
-                ...settled?.model === undefined ? {} : { observedModel: settled.model },
+                ...mirrored?.model === undefined ? {} : { observedModel: mirrored.model },
                 ...cliVersion === undefined ? {} : { cliVersion },
                 ...roundUsage === undefined ? {} : { usage: roundUsage },
-                ...settled?.toolCalls === undefined ? {} : { toolCalls: settled.toolCalls },
+                ...mirrored?.toolCalls === undefined ? {} : { toolCalls: mirrored.toolCalls },
             });
         });
     }, () => { });

package/lib/types/live-driver.d.ts

@@ -16,11 +16,14 @@
  * throttled `mirrorKimiDelta` passes and the settle pass stays authoritative
  * (one fold, one offset, zero divergence between the two drivers). Every
  * transcript item folds 1:1 into the child session log.
- * Live output also mirrors the in-flight item: chunk
- * deltas accumulate per streaming item and append throttled snapshot
- * assistant/messages at the item's reserved (turn, step) — the host folds
- * repeated settles at one coordinate into one live-updating chat node — and
- * the wire line completing the item folds at the same step, finalizing it.
+ * Live output rides the `local-agent/stream` channel: chunk deltas
+ * accumulate per streaming item and publish throttled updates at the item's
+ * reserved (turn, step) — the member live node renders them as-is — while
+ * the item's durable content lands as ONE atomic step/start→…→step/end
+ * triple at that step, written by the completing wire line's fold or at
+ * settle. Durable steps stay dense and strictly sequential (the released-log
+ * reader validates exactly that on every cold open); snapshots never hold a
+ * step open across appends.
  *
  * Lifecycle mirrors the dsh/codex live drivers' discipline: lazy spawn with an
  * initialize handshake (loadSession capability required — crash recovery is