@deepseek-harness-tui/dsh-tui 0.11.2 → 0.12.0

package/{node_modules/@deepseek-harness-tui/dsh-auth/lib → lib/types/dsh-adapter/oauth}/service.js

@@ -1,16 +1,19 @@
 /**
- * The `ctx.dshAuth` service: the programmatic surface over this plugin's
+ * The `ctx.dshAuth` service: the programmatic surface over this module's
  * mounted OAuth routes. UIs (the dsh-tui /provider wizard, a web settings
  * page) enumerate providers with masked sign-in state and drive login/logout
  * without touching the credential file or the pi-ai flow objects; the `/auth`
  * command in `command.ts` is a thin textual veneer over the same api.
  *
- * @module dsh-auth/service
+ * @module @deepseek-harness-tui/dsh-tui/oauth/service
  */
 import { Service } from '@deepseek-ai/cordis';
 import { asStoredCredential } from './credentials.js';
 import { oauthOf } from './profiles.js';
 import { QuestionBridge } from './interaction.js';
+import { loginOAuth } from './pi-ai.js';
+import { DEEPSEEK_ACCOUNT_PROVIDER, deepSeekClientMetadata, loginDeepSeekAccount, } from './deepseek.js';
+import { WhaleCouponStore } from './bonus.js';
 /**
  * The constructed catalog provider one mounted route carries. 0.1.5 made
  * `ResolvedPiAiProviderProfile.piProvider` optional (a stored route that
@@ -27,6 +30,7 @@ function mountedProvider(profile) {
 /** Cordis service holder; `api` is set by the plugin's apply. */
 export class DshAuthService extends Service {
     api;
+    coupons = new WhaleCouponStore();
     constructor(ctx) {
         super(ctx, 'dshAuth');
     }
@@ -56,9 +60,13 @@ async function chooseProvider(ask, candidates, signal) {
  */
 export function createDshAuthApi(deps) {
     const inflight = new Map();
+    const mountedIds = () => [
+        ...deps.profiles.keys(),
+        ...(deps.resolveDeepSeekAccount?.() === undefined ? [] : [DEEPSEEK_ACCOUNT_PROVIDER]),
+    ];
     const statusOf = async () => {
         const described = new Map((await deps.store.describe()).map(row => [row.provider, row]));
-        return [...deps.profiles.entries()].map(([id, profile]) => {
+        const piAi = [...deps.profiles.entries()].map(([id, profile]) => {
             const oauth = oauthOf(mountedProvider(profile));
             const row = described.get(id);
             return {
@@ -71,32 +79,55 @@ export function createDshAuthApi(deps) {
                 expired: row?.expired ?? false,
             };
         });
+        const account = deps.resolveDeepSeekAccount?.();
+        if (account === undefined)
+            return piAi;
+        const state = await account.getState();
+        return [{
+                provider: DEEPSEEK_ACCOUNT_PROVIDER,
+                label: 'DeepSeek Account',
+                oauthLabel: 'DeepSeek',
+                loginLabel: 'Sign in with DeepSeek',
+                signedIn: state.status === 'credential-stored',
+                expiresAt: undefined,
+                expired: false,
+            }, ...piAi];
     };
     const loginOne = async (provider, ask, signal) => {
         const profile = deps.profiles.get(provider);
         if (profile === undefined) {
-            throw new Error(`dsh-auth: unknown provider "${provider}" (mounted: ${[...deps.profiles.keys()].join(', ')})`);
+            throw new Error(`dsh-auth: unknown provider "${provider}" (mounted: ${mountedIds().join(', ')})`);
         }
         const oauth = oauthOf(mountedProvider(profile));
         const runAbort = new AbortController();
+        const forwardAbort = () => runAbort.abort(signal?.reason);
         if (signal !== undefined) {
             if (signal.aborted)
-                runAbort.abort(signal.reason);
+                forwardAbort();
             else
-                signal.addEventListener('abort', () => runAbort.abort(signal.reason), { once: true });
+                signal.addEventListener('abort', forwardAbort, { once: true });
         }
         const bridge = new QuestionBridge(ask, runAbort);
         try {
-            const returned = await oauth.login(bridge);
+            runAbort.signal.throwIfAborted();
+            const returned = await loginOAuth(oauth, bridge, {
+                // pi-ai 0.87.1's `openai` flow needs this on login. Older flows
+                // ignore the optional context, so the ID is created only on demand.
+                getDeviceId: () => deps.store.getOrCreateDeviceId(),
+            });
             const normalized = asStoredCredential(returned);
             if (normalized === undefined) {
                 throw new Error(`dsh-auth: the ${oauth.name} flow returned an unusable credential; nothing was stored`);
             }
-            const stored = normalized;
-            await deps.store.modify(provider, async () => stored);
-            return { provider, oauthLabel: oauth.name, expiresAt: stored.expires };
+            await deps.store.modify(provider, async () => {
+                // Logout may have cancelled the flow while this write waited for the file lock.
+                runAbort.signal.throwIfAborted();
+                return normalized;
+            });
+            return { provider, oauthLabel: oauth.name, expiresAt: normalized.expires };
         }
         finally {
+            signal?.removeEventListener('abort', forwardAbort);
             await bridge.settle();
         }
     };
@@ -115,24 +146,58 @@ export function createDshAuthApi(deps) {
                     throw new Error('dsh-auth: every mounted provider is already signed in');
                 target = await chooseProvider(ask, candidates, signal);
             }
-            else if (!deps.profiles.has(target)) {
-                throw new Error(`dsh-auth: unknown provider "${target}" (mounted: ${[...deps.profiles.keys()].join(', ')})`);
+            else if (!mountedIds().includes(target)) {
+                throw new Error(`dsh-auth: unknown provider "${target}" (mounted: ${mountedIds().join(', ')})`);
             }
             if (ask === undefined) {
                 throw new Error(`dsh-auth: signing in to "${target}" needs an interactive surface (run inside dsh-tui or the web client); `
                     + 'this plugin refuses to assume a browser on this machine');
             }
-            const existing = inflight.get(target);
-            if (existing !== undefined) {
+            if (inflight.has(target)) {
                 throw new Error(`dsh-auth: a login for "${target}" is already running`);
             }
-            const run = loginOne(target, ask, signal).finally(() => { inflight.delete(target); });
-            inflight.set(target, run);
+            const account = target === DEEPSEEK_ACCOUNT_PROVIDER ? deps.resolveDeepSeekAccount?.() : undefined;
+            if (target === DEEPSEEK_ACCOUNT_PROVIDER && account === undefined) {
+                throw new Error(`dsh-auth: provider "${target}" is no longer mounted`);
+            }
+            const cancellation = new AbortController();
+            const runSignal = signal === undefined ? cancellation.signal : AbortSignal.any([signal, cancellation.signal]);
+            inflight.set(target, cancellation);
+            const run = (account === undefined
+                ? loginOne(target, ask, runSignal)
+                : (async () => {
+                    runSignal.throwIfAborted();
+                    const callbackOrigin = await deps.resolveCallbackOrigin?.();
+                    runSignal.throwIfAborted();
+                    if (callbackOrigin === undefined) {
+                        throw new Error('DeepSeek sign-in needs an active Host webServer for the browser callback');
+                    }
+                    await loginDeepSeekAccount(account, callbackOrigin, ask, runSignal);
+                    deps.coupons?.clear();
+                    const getUnnotifiedBonuses = account.getUnnotifiedBonuses?.bind(account);
+                    const ackBonusNotified = account.ackBonusNotified?.bind(account);
+                    if (getUnnotifiedBonuses !== undefined && ackBonusNotified !== undefined) {
+                        void deps.coupons?.refresh({ getUnnotifiedBonuses, ackBonusNotified });
+                    }
+                    return { provider: target, oauthLabel: 'DeepSeek', expiresAt: undefined };
+                })()).finally(() => { inflight.delete(target); });
             return run;
         },
         logout: async (provider) => {
+            // A DeepSeek login may still be awaiting its callback listener, before
+            // the Host has an attempt to cancel. Abort it before Host sign-out.
+            inflight.get(provider)?.abort(new Error('Login cancelled'));
+            if (provider === DEEPSEEK_ACCOUNT_PROVIDER) {
+                const account = deps.resolveDeepSeekAccount?.();
+                if (account !== undefined) {
+                    const existed = (await account.getState()).status === 'credential-stored';
+                    await account.signOut(deepSeekClientMetadata());
+                    deps.coupons?.clear();
+                    return existed;
+                }
+            }
             if (!deps.profiles.has(provider)) {
-                throw new Error(`dsh-auth: unknown provider "${provider}" (mounted: ${[...deps.profiles.keys()].join(', ')})`);
+                throw new Error(`dsh-auth: unknown provider "${provider}" (mounted: ${mountedIds().join(', ')})`);
             }
             const existed = (await deps.store.read(provider)) !== undefined;
             await deps.store.delete(provider);

package/lib/types/dsh-adapter/plugin.d.ts

@@ -43,7 +43,14 @@ export declare function apply(ctx: Context, runtimeConfig: RuntimeConfig<Config>
 export declare function createExitFunnel(deps: {
     onUserExit: (error?: unknown) => void;
 }): {
-    handleExit: (error?: unknown) => void;
+    /**
+     * Settle the exit once.
+     * @returns true when this call ran the user-exit path (the funnel now owns
+     *  the process), false when it was already settled or the tree is being
+     *  torn down. A process-level crash backstop must fall back to Node's
+     *  default crash on false instead of swallowing the error.
+     */
+    handleExit: (error?: unknown) => boolean;
     markTeardown: () => void;
 };
 /**

package/lib/types/dsh-adapter/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,wBAAwB,CAAA;AAGhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAA+D,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAwDtH,OAAO,EAAE,MAAM,EAAkC,MAAM,UAAU,CAAA;AAkCjE;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,MAAM,CAsBxF;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG,yBAAyB,GAAG,eAAe,CAAA;AAErF,wBAAgB,kBAAkB,CAChC,WAAW,UAAgC,EAC3C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,WAAW,CASb;AAED,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,WAAW,GAAE,OAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA84CzH;AAmMD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG;IACjF,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IACrC,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB,CAcA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,KAAK,GAAG,SAAS,CAAA;IAC5B,YAAY,EAAE,KAAK,CAAA;CACpB,GAAG,OAAO,CAQV;AAgBD;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,GAAG,SAAS,EACxD,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,IAAI,EAAE,MAAM,IAAI,GACf,OAAO,CAAC,IAAI,CAAC,CAmFf;AA4HD,gFAAgF;AAChF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAIrE"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,wBAAwB,CAAA;AAGhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAA+D,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAyDtH,OAAO,EAAE,MAAM,EAAkC,MAAM,UAAU,CAAA;AAmCjE;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GAAG,MAAM,CAsBxF;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG,yBAAyB,GAAG,eAAe,CAAA;AAErF,wBAAgB,kBAAkB,CAChC,WAAW,UAAgC,EAC3C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,WAAW,CASb;AAED,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,WAAW,GAAE,OAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAw8CzH;AAmMD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAAG;IACjF;;;;;;OAMG;IACH,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;IACxC,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB,CAeA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,KAAK,GAAG,SAAS,CAAA;IAC5B,YAAY,EAAE,KAAK,CAAA;CACpB,GAAG,OAAO,CAQV;AAgBD;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,GAAG,SAAS,EACxD,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,IAAI,EAAE,MAAM,IAAI,GACf,OAAO,CAAC,IAAI,CAAC,CAmFf;AA4HD,gFAAgF;AAChF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAIrE"}

package/lib/types/dsh-adapter/plugin.js

@@ -61,6 +61,7 @@ import instances from '../ink/instances.js';
 import { cursorMove, DISABLE_KITTY_KEYBOARD, DISABLE_MODIFY_OTHER_KEYS, DISABLE_WIN32_INPUT_MODE } from '../ink/termio/csi.js';
 import { DBP, DFE, DISABLE_MOUSE_TRACKING, EXIT_ALT_SCREEN, SHOW_CURSOR } from '../ink/termio/dec.js';
 import { CLEAR_ITERM2_PROGRESS, CLEAR_TAB_STATUS, supportsTabStatus, wrapForMultiplexer } from '../ink/termio/osc.js';
+import { fatalReasonForExit, registerProcessGuardFatalSink } from '../ink/update-overflow-guard.js';
 /**
  * Interactive TUI front door for DeepSeek Harness agents.
  *
@@ -274,10 +275,10 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     const userQuestions = ctx.get('userQuestions') ?? new UserQuestionService(ctx);
     ctx.plugin(toolAskUser);
     // The host-level tool mount above is intentional for the TUI and for user
-    // presets, but the official Minimal preset is a strict two-tool trajectory
-    // (persistent bash + str_replace_editor). Filter only that preset at the
-    // final assembly boundary. Reading the session on every assembly also makes
-    // blank-session /preset switches and resumed sessions behave correctly.
+    // presets, but the official Minimal preset is a single-tool trajectory (one
+    // persistent shell: bash on POSIX, pwsh on Windows). Filter only that preset
+    // at the final assembly boundary. Reading the session on every assembly also
+    // makes blank-session /preset switches and resumed sessions behave correctly.
     ctx.on('system-prompt/assemble', async (_assembly, context, next) => {
         const assembled = await next();
         const presetId = context.agent === undefined ? undefined : runningPresetOf(context.agent.session);
@@ -431,7 +432,20 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
         // reads the same records. There is deliberately no rail-side "add a
         // workspace" control any more: a terminal's launch directory is the whole
         // registration story.
-        const attached = await attachSessionToWorkspace(ctx, meta.cwd, agent.session.id);
+        //
+        // A RESUMED session is accounted where its OWN header cwd lives, never
+        // where this terminal was launched. The launch directory can be an
+        // ANCESTOR of the resumed session's: launching in `~/projects` and
+        // resuming a session recorded in `~/projects/app` accounts the same
+        // session in both workspaces, and the next boot dies inside
+        // `validateStoredState` ("session ... is accounted by both workspace
+        // ..."), which leaves `workspaceRegistry` unactivated and the whole TUI
+        // pending forever. Ownership must therefore agree with the `cwd:` handed
+        // to `createChannel` below, which already prefers the persisted header.
+        // Fresh sessions record `meta.cwd` at creation, so the launch directory
+        // still registers through them.
+        const ownershipCwd = agent.session.header.cwd ?? meta.cwd;
+        const attached = await attachSessionToWorkspace(ctx, ownershipCwd, agent.session.id);
         if (!attached) {
             ctx.logger.warn(`dsh-tui: session "${agent.session.id}" has no workspace ownership because workspaceRegistry is not mounted`);
         }
@@ -670,8 +684,9 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
             // (undefined → daily), so cordis.yml stays decisive and junk lands on
             // daily.
             splashFont: Schema.string(),
-            // Minimal mode: strips the header splash, emoji glyphs, and
-            // decorative colors; code highlight and tool colors stay.
+            // Minimal UI (极简界面, settings key `minimal` — never renamed): strips
+            // the header splash, emoji glyphs, and decorative colors; code highlight
+            // and tool colors stay. Unrelated to the kernel agent preset `minimal`.
             minimal: Schema.boolean().default(false),
             // No default on purpose: an unset `lang` keeps the field showing
             // the effective language (see the section's format below) and lets
@@ -714,10 +729,12 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
                 return;
             channel.setSplashFont(normalizeSplashFont(value.splashFont ?? config.splashFont));
         };
-        const applyMinimal = (value) => {
+        const applyMinimalUi = (value) => {
             if (shadow)
                 return;
-            channel.setMinimal(value.minimal ?? false);
+            // `value.minimal` is the persisted settings key (never renamed); the
+            // channel member is the minimal-UI flag, NOT the kernel preset.
+            channel.setMinimalUi(value.minimal ?? false);
         };
         // Renderer settings are resolved before mount; later edits wait for restart.
         const applyRendererSettings = (value) => {
@@ -802,7 +819,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
             applyWhaleIdle(next);
             applyWhaleGirl(next);
             applySplashFont(next);
-            applyMinimal(next);
+            applyMinimalUi(next);
             applyLang(next);
             applyDisplay(next);
             applyEffortDefault(next);
@@ -1190,6 +1207,24 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
             if (error !== undefined) {
                 const message = error instanceof Error ? error.message : String(error);
                 ctx.logger.error(`dsh-tui: exit after error: ${message}`);
+                // A crash must leave the resume marker a clean exit would leave: the
+                // launcher's next start (and its safe-mode retry) then reopens the
+                // session the user was actually in instead of a blank one. Only the
+                // resumable case writes — unlike the clean-exit branch below, a crash
+                // never CLEARS a marker, so a session the user still has cannot be
+                // dropped by a failure that happened before the first message landed.
+                try {
+                    if (isExitResumable({
+                        pendingCount: channel.pending.length,
+                        liveAgent: ctx.agents.get(SessionId(channel.agentId)),
+                        startupAgent: agent,
+                    })) {
+                        writeResumeTarget(channel.agentId);
+                    }
+                }
+                catch {
+                    // Resume persistence is best effort and must never block the exit.
+                }
                 void finishExit(ctx, instance, bootedFullscreen, undefined, `dsh-tui crashed: ${message}`, () => disposeRootAndExit(ctx, 1));
                 return;
             }
@@ -1250,6 +1285,25 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
         },
     });
     const handleExit = funnel.handleExit;
+    // Process-level crash backstop (see installNestedUpdateOverflowProcessGuard):
+    // an uncaught exception or unhandled rejection that is NOT the React #185
+    // overflow would otherwise take Node's default path and kill the process
+    // before this funnel runs — no resume marker, no terminal restore, and the
+    // launcher's "entered safe mode" prompt on what looks like a lost session.
+    // Route it through the same teardown a fatal RENDER error uses: unmount,
+    // `dsh-tui crashed: …`, dispose, exit 1. Fail loud stays intact — the funnel
+    // returns false when it has already settled or the tree is being torn down
+    // (host recompose), and the guard then rethrows to Node's default crash.
+    // DSH_TUI_NO_185_PROCESS_GUARD=1 skips the guard entirely, leaving process
+    // error policy to the host exactly as before.
+    registerProcessGuardFatalSink((error, origin) => {
+        // An undefined reason (`Promise.reject()`, `throw undefined`) must not reach
+        // the funnel as-is: `error !== undefined` is what selects the crash path, so
+        // a bare undefined would exit 0 while this sink claims the process.
+        const fatal = fatalReasonForExit(error, origin);
+        ctx.logger.error(`dsh-tui: fatal ${origin}: ${fatal instanceof Error ? fatal.message : String(fatal)}`);
+        return handleExit(fatal);
+    });
     // External injection controller: Chat fills it with `{ append, submit }`
     // every render; the injection socket (opened below) drives it. A ref rather
     // than a prop callback so the socket handler always reaches the live Chat.
@@ -1289,6 +1343,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
         // shortcuts). Soft-consumed: absent the row (stale patch, bare embed),
         // Chat falls back to inert stores and no shortcut registry.
         extensionDialogs: getHostDialogStore(ctx.get('tuiDialogs')),
+        bonusNotices: ctx.get('dshAuth')?.coupons,
         extensionStatus: getHostStatusStore(ctx.get('tuiStatus')),
         // The working line's semantics belong to the dsh-working-activity plugin's
         // session projection; this store is the read side of that seam, so the TUI
@@ -1445,6 +1500,10 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     ctx.effect(() => () => {
         logMouseDebug('apply teardown');
         funnel.markTeardown();
+        // Drop the crash backstop with this mount: a torn-down funnel cannot own
+        // the process, so a later fatal error falls back to Node's default crash
+        // instead of reaching a disposed ctx.
+        registerProcessGuardFatalSink(undefined);
         rawChannel.releaseContributions();
         instance?.unmount();
     });
@@ -1648,11 +1707,12 @@ export function createExitFunnel(deps) {
         },
         handleExit: (error) => {
             if (teardown)
-                return;
+                return false;
             if (exited)
-                return;
+                return false;
             exited = true;
             deps.onUserExit(error);
+            return true;
         },
     };
 }

package/lib/types/dsh-adapter/presets.d.ts

@@ -79,10 +79,12 @@ export declare function runningPresetOf(session: unknown): string | undefined;
  */
 export declare function resolvePersistedRoute(ctx: Context, sessionId: SessionId): Promise<ModelRoute | undefined>;
 /**
- * Keep the official Minimal preset's model-facing contract at exactly two
- * tools. The TUI mounts ask_user_question at the host layer so every other
- * preset (including user presets) can use its questionnaire UI; host-layer
- * tools otherwise merge into Minimal's scoped catalog as a third tool.
+ * Keep the official Minimal preset's model-facing catalog minimal. The preset
+ * itself declares exactly one persistent shell tool (bash on POSIX, pwsh on
+ * Windows), while the TUI mounts ask_user_question at the host layer so every
+ * other preset (including user presets) can use its questionnaire UI —
+ * that host-layer tool otherwise merges into Minimal's scoped catalog as an
+ * extra tool.
  *
  * This is a per-assembly filter rather than a startup-time decision because
  * one TUI process can resume, create, or recompose sessions under different

package/lib/types/dsh-adapter/presets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"presets.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/presets.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AACpE,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAWtE,kEAAkE;AAClE,MAAM,WAAW,iBAAiB;IAChC,kFAAkF;IAClF,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,yEAAyE;IACzE,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAA;CAC5B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAmBhG;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAW5G;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAGpE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAW/G;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,cAAc,CAM/G;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAKpG"}
+{"version":3,"file":"presets.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/presets.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AACpE,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAWtE,kEAAkE;AAClE,MAAM,WAAW,iBAAiB;IAChC,kFAAkF;IAClF,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,yEAAyE;IACzE,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAA;CAC5B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAmBhG;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAW5G;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAGpE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAW/G;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,cAAc,CAM/G;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAKpG"}

package/lib/types/dsh-adapter/presets.js

@@ -120,10 +120,12 @@ export async function resolvePersistedRoute(ctx, sessionId) {
     }
 }
 /**
- * Keep the official Minimal preset's model-facing contract at exactly two
- * tools. The TUI mounts ask_user_question at the host layer so every other
- * preset (including user presets) can use its questionnaire UI; host-layer
- * tools otherwise merge into Minimal's scoped catalog as a third tool.
+ * Keep the official Minimal preset's model-facing catalog minimal. The preset
+ * itself declares exactly one persistent shell tool (bash on POSIX, pwsh on
+ * Windows), while the TUI mounts ask_user_question at the host layer so every
+ * other preset (including user presets) can use its questionnaire UI —
+ * that host-layer tool otherwise merges into Minimal's scoped catalog as an
+ * extra tool.
  *
  * This is a per-assembly filter rather than a startup-time decision because
  * one TUI process can resume, create, or recompose sessions under different

package/lib/types/dsh-adapter/providerWizard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"providerWizard.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/providerWizard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAsH,MAAM,sCAAsC,CAAA;AACjM,YAAY,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,aAAa,EAAE,cAAc,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAsBjM,OAAO,EAEL,KAAK,qBAAqB,EAE1B,KAAK,sBAAsB,EAC5B,MAAM,iCAAiC,CAAA;AACxC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,iFAAiF;AACjF,eAAO,MAAM,iBAAiB,QAAoC,CAAA;AAElE,2EAA2E;AAC3E,eAAO,MAAM,kBAAkB,2EAIrB,CAAA;AAEV;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAA;IAChC,QAAQ,CAAC,GAAG,EAAE,CACZ,OAAO,EAAE,sBAAsB,EAC/B,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KAC3B,OAAO,CAAC,qBAAqB,CAAC,CAAA;IACnC,QAAQ,CAAC,MAAM,EAAE,CACf,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KACtE,IAAI,CAAA;IACT,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,IAAI,CAAA;IACrE,2EAA2E;IAC3E,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAA;IAC/B,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5E;AAED,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,WAAW,GAAG,QAAQ,CAAA;AA4D3G;;;;;;;;;;;;GAYG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,qBAAqB,CAAC,CA8BhC;AAo3BD,8DAA8D;AAC9D,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,QAAQ,GAAG,aAAa,CAAA;AACrE,MAAM,MAAM,qBAAqB,GAAG,SAAS,GAAG,QAAQ,GAAG,aAAa,CAAA;AACxE,MAAM,MAAM,oBAAoB,GAC5B,aAAa,GACb,qBAAqB,GACrB,gBAAgB,CAAA;AAEpB,qEAAqE;AACrE,MAAM,WAAW,cAAc;IAC7B;uEACmE;IACnE,QAAQ,CAAC,IAAI,EAAE,SAAS,kBAAkB,EAAE,CAAA;IAC5C,6EAA6E;IAC7E,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IACxC,8DAA8D;IAC9D,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAA;IACvC,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAA;IACjC,QAAQ,CAAC,MAAM,CAAC,EAAE,oBAAoB,CAAA;CACvC"}
+{"version":3,"file":"providerWizard.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/providerWizard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAsH,MAAM,sCAAsC,CAAA;AACjM,YAAY,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,aAAa,EAAE,cAAc,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAA;AAsBjM,OAAO,EAEL,KAAK,qBAAqB,EAE1B,KAAK,sBAAsB,EAC5B,MAAM,iCAAiC,CAAA;AACxC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAE9D,iFAAiF;AACjF,eAAO,MAAM,iBAAiB,QAAoC,CAAA;AAElE,2EAA2E;AAC3E,eAAO,MAAM,kBAAkB,2EAIrB,CAAA;AAEV;;;GAGG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAA;IAChC,QAAQ,CAAC,GAAG,EAAE,CACZ,OAAO,EAAE,sBAAsB,EAC/B,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,KAC3B,OAAO,CAAC,qBAAqB,CAAC,CAAA;IACnC,QAAQ,CAAC,MAAM,EAAE,CACf,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,KACtE,IAAI,CAAA;IACT,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,IAAI,CAAA;IACrE,2EAA2E;IAC3E,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAA;IAC/B,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC5E;AAED,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,YAAY,GAAG,WAAW,GAAG,QAAQ,CAAA;AA4D3G;;;;;;;;;;;;GAYG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,kBAAkB,GACvB,OAAO,CAAC,qBAAqB,CAAC,CA8BhC;AAw3BD,8DAA8D;AAC9D,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,QAAQ,GAAG,aAAa,CAAA;AACrE,MAAM,MAAM,qBAAqB,GAAG,SAAS,GAAG,QAAQ,GAAG,aAAa,CAAA;AACxE,MAAM,MAAM,oBAAoB,GAC5B,aAAa,GACb,qBAAqB,GACrB,gBAAgB,CAAA;AAEpB,qEAAqE;AACrE,MAAM,WAAW,cAAc;IAC7B;uEACmE;IACnE,QAAQ,CAAC,IAAI,EAAE,SAAS,kBAAkB,EAAE,CAAA;IAC5C,6EAA6E;IAC7E,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IACxC,8DAA8D;IAC9D,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAA;IACvC,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAA;IACjC,QAAQ,CAAC,MAAM,CAAC,EAAE,oBAAoB,CAAA;CACvC"}

package/lib/types/dsh-adapter/providerWizard.js

@@ -817,7 +817,9 @@ function buildDeleteSummary(provider) {
 /** Masked state line for one provider row in the OAuth pick question. */
 function oauthStateDescription(status) {
     if (status.signedIn) {
-        return t('provider-oauth-state-in', { time: new Date(status.expiresAt ?? 0).toISOString() });
+        return status.expiresAt === undefined
+            ? t('provider-oauth-state-in-no-expiry')
+            : t('provider-oauth-state-in', { time: new Date(status.expiresAt).toISOString() });
     }
     return status.expired
         ? t('provider-oauth-state-expired')
@@ -872,7 +874,9 @@ async function runOAuthWizard(deps, oauth) {
         pushLocal('/provider', [
             t('provider-line-oauth-provider', { provider: result.provider }),
             t('provider-line-oauth-flow', { flow: result.oauthLabel }),
-            t('provider-line-oauth-expires', { time: new Date(result.expiresAt).toISOString() }),
+            ...(result.expiresAt === undefined
+                ? []
+                : [t('provider-line-oauth-expires', { time: new Date(result.expiresAt).toISOString() })]),
             t('provider-switch-hint'),
         ]);
         notify(t('provider-oauth-login-ok', { provider: result.provider }), { color: 'success' });

package/lib/types/dsh-adapter/subagents.d.ts

@@ -32,6 +32,7 @@ export declare class SubagentActivityStore {
         live?: boolean;
         provider?: string;
         model?: string;
+        mode?: 'one-shot' | 'continuable' | 'unknown';
     }): void;
     linkSession(agentId: string, session: unknown): void;
     getSubagentIdBySession(session: unknown): string | undefined;

package/lib/types/dsh-adapter/subagents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagents.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/subagents.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subagents.d.ts","sourceRoot":"","sources":["../../../src/dsh-adapter/subagents.ts"],"names":[],"mappings":"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"}

package/lib/types/dsh-adapter/subagents.js

@@ -89,8 +89,16 @@ export class SubagentActivityStore {
      * row running; an idle historical child shows as `unknown` (the parent log
      * alone cannot prove how its last epoch ended). */
     onDiscovered(agentId, info = {}) {
-        if (this.states.has(agentId))
+        const existing = this.states.get(agentId);
+        if (existing !== undefined) {
+            // A bus edge usually created the row first; the durable catalog fact
+            // still carries the one thing the edge never knows — the mode.
+            if (info.mode !== undefined && existing.mode === undefined) {
+                existing.mode = info.mode;
+                this.notify();
+            }
             return;
+        }
         this.states.set(agentId, {
             agentId,
             description: info.label ?? `${info.provider ?? 'subagent'} task`,
@@ -99,6 +107,7 @@ export class SubagentActivityStore {
             status: info.live ? 'running' : 'unknown',
             startedAt: info.childCreatedAt ?? Date.now(),
             sessionId: agentId,
+            ...(info.mode === undefined ? {} : { mode: info.mode }),
             output: [],
             outputEvents: [],
             toolCalls: [],