@askdkc/dsh-cli 0.13.4 → 0.14.0

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

@@ -31,9 +31,9 @@ import { registerTuiSessionEventTypes, snapshotLiveSessionEvents } from './compa
 import { clearResumeTarget, resumeCommand, resumeTargetFromArgv, writeResumeTarget } from '../sessionHistory.js';
 import { readHomePrefs } from '../homePrefs.js';
 import { resolveSessionCwd } from '../utils/workspaceRoot.js';
-import { beginRestartAttempt, checkForTuiUpdate, installedTuiVersion, isBootDeadlockTarget, isStandaloneRuntime, isVersionNewer, logRestartEvent, resolveDshProfileName, resolveTuiUpdateTarget, restartTui, updateTuiAndRestart, writeHandoffNotice } from '../update.js';
+import { beginRestartAttempt, checkForCliUpdate, installedCliVersion, isBootDeadlockTarget, isStandaloneRuntime, isVersionNewer, logRestartEvent, resolveDshProfileName, resolveCliUpdateTarget, restartCli, updateCliAndRestart, writeHandoffNotice } from '../update.js';
 import { getLang, isLang, resolveStartupLang, setLang, t, writeLangPref } from '../i18n.js';
-import { DEFAULT_PAGE_MARGIN, applyMermaidDiagrams, applyPageMargin, isPageMarginMode, normalizePageMargin, normalizeScrollGutter, normalizeStatusBar, normalizeToolBackground, parsePageMarginSpec } from '../tuiDisplayPrefs.js';
+import { DEFAULT_PAGE_MARGIN, applyMermaidDiagrams, applyPageMargin, isPageMarginMode, normalizePageMargin, normalizeScrollGutter, normalizeStatusBar, normalizeToolBackground, parsePageMarginSpec } from '../cliDisplayPrefs.js';
 import { draftComboConflicts, effectiveComboString, parseComboDraft, setKeymapOverrides, SHORTCUT_ACTIONS, } from '../utils/keymap.js';
 import { attachHerdrIntegration } from '../herdr.js';
 import { logMouseDebug } from '../utils/debug.js';
@@ -109,15 +109,15 @@ export function resolveTuiHostMode(stdoutIsTTY = process.stdout.isTTY === true,
     if (stdoutIsTTY) {
         return 'interactive';
     }
-    const explicitTuiLaunch = env.DSH_TUI_LAUNCHER_VERSION !== undefined || isStandaloneRuntime();
+    const explicitTuiLaunch = env.DSH_CLI_LAUNCHER_VERSION !== undefined || isStandaloneRuntime();
     return explicitTuiLaunch ? 'invalid-explicit-launch' : 'headless-host';
 }
 export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     const config = configValues(runtimeConfig);
     // /restart handoff diagnosis: the replacement process is marked by env and
-    // logs its boot progress to ~/.dsh-tui/restart.log (ordinary launches stay
+    // logs its boot progress to ~/.dsh-cli/restart.log (ordinary launches stay
     // silent). First line lands before anything in this function can throw.
-    if (process.env.DSH_TUI_RESTART_CHILD === '1') {
+    if (process.env.DSH_CLI_RESTART_CHILD === '1') {
         logRestartEvent('boot: plugin apply', {
             stdoutTty: process.stdout.isTTY === true,
             stdinTty: process.stdin.isTTY === true,
@@ -171,44 +171,44 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     }
     const hostMode = resolveTuiHostMode();
     if (hostMode === 'invalid-explicit-launch') {
-        if (process.env.DSH_TUI_RESTART_CHILD === '1') {
+        if (process.env.DSH_CLI_RESTART_CHILD === '1') {
             logRestartEvent('boot: TTY gate failed - stdout is not a TTY');
         }
-        throw new Error('dsh-tui requires an interactive terminal (stdout must be a TTY).');
+        throw new Error('dsh-cli requires an interactive terminal (stdout must be a TTY).');
     }
     if (hostMode === 'headless-host') {
         // Web / Tauri / GUI hosts load the plugin from the profile without being
-        // a dsh-tui frontend (stdout is a pipe or null). Mounting a TUI there
+        // a dsh-cli frontend (stdout is a pipe or null). Mounting a TUI there
         // would fail the whole composition, so skip quietly and let the host
-        // boot. The launcher marker above keeps explicit `dsh-tui` launches
+        // boot. The launcher marker above keeps explicit `dsh-cli` launches
         // failing loudly instead of silently producing no UI.
-        ctx.logger.info('dsh-tui: non-interactive host detected (stdout is not a TTY); skipping the TUI frontend');
+        ctx.logger.info('dsh-cli: non-interactive host detected (stdout is not a TTY); skipping the TUI frontend');
         return;
     }
     // Validate settings before creating an agent or taking over the terminal.
     const tuiSettingsNs = resolveSettingsNamespace(configOwner, Config);
     registerResponseLanguage(ctx);
     await registerBundledPresets(ctx);
-    // UI language resolution: DSH_TUI_LANG env var wins, then the
-    // active profile `dsh-tui.lang` configuration (applied once the settings
+    // UI language resolution: DSH_CLI_LANG env var wins, then the
+    // active profile `dsh-cli.lang` configuration (applied once the settings
     // namespace registers below), then cordis.yml `lang`, then the
     // persisted `/lang` choice, then the locale, falling back to `en`. Must settle before the first
     // render so every module resolves strings in the same language.
-    const envLang = process.env.DSH_TUI_LANG;
+    const envLang = process.env.DSH_CLI_LANG;
     setLang(isLang(envLang) ? envLang : isLang(config.lang) ? config.lang : resolveStartupLang());
     if (resolveDshProfileName() === 'dsh-cli'
         && !isStandaloneRuntime()
         && !process.env.CI
-        && process.env.DSH_TUI_AUTO_REGISTER_CLI !== '0') {
+        && process.env.DSH_CLI_AUTO_REGISTER_CLI !== '0') {
         try {
             const result = ensureCliRegistered();
             if (result.startsWith('Registered ') || result.startsWith('Kept '))
-                ctx.logger.info(`dsh-tui: ${result}`);
+                ctx.logger.info(`dsh-cli: ${result}`);
             else if (result.startsWith('Existing '))
-                ctx.logger.warn(`dsh-tui: ${result} Remove the conflicting command or adjust PATH, then restart the TUI.`);
+                ctx.logger.warn(`dsh-cli: ${result} Remove the conflicting command or adjust PATH, then restart the TUI.`);
         }
         catch (error) {
-            ctx.logger.warn(`dsh-tui: dsh-cli command registration failed: ${error instanceof Error ? error.message : String(error)}. Resolve the reported path or permission issue, then restart the TUI; set DSH_TUI_AUTO_REGISTER_CLI=0 to disable registration.`);
+            ctx.logger.warn(`dsh-cli: dsh-cli command registration failed: ${error instanceof Error ? error.message : String(error)}. Resolve the reported path or permission issue, then restart the TUI; set DSH_CLI_AUTO_REGISTER_CLI=0 to disable registration.`);
         }
     }
     // /update restart verification: the pre-update process stamps the version
@@ -217,34 +217,34 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     // lag, cached manifest, wrong profile). Say so instead of silently
     // pretending the update landed.
     {
-        const updatedFrom = process.env.DSH_TUI_UPDATED_FROM;
+        const updatedFrom = process.env.DSH_CLI_UPDATED_FROM;
         if (updatedFrom !== undefined) {
             // Assigning undefined would stringify to "undefined" and leak the
             // marker into every child process; remove it for real.
-            delete process.env.DSH_TUI_UPDATED_FROM;
-            const now = installedTuiVersion();
+            delete process.env.DSH_CLI_UPDATED_FROM;
+            const now = installedCliVersion();
             if (now === undefined || !isVersionNewer(now, updatedFrom)) {
-                ctx.logger.warn(`dsh-tui: /update restarted but the version did not advance (still ${now ?? 'unknown'}, was ${updatedFrom})`);
+                ctx.logger.warn(`dsh-cli: /update restarted but the version did not advance (still ${now ?? 'unknown'}, was ${updatedFrom})`);
                 if (process.stderr.isTTY) {
-                    process.stderr.write(`\ndsh-tui: 更新后版本未变化（仍为 ${now ?? 'unknown'}，原为 ${updatedFrom}）；` +
+                    process.stderr.write(`\ndsh-cli: 更新后版本未变化（仍为 ${now ?? 'unknown'}，原为 ${updatedFrom}）；` +
                         `可能是镜像 registry 未同步，请稍后重试或检查 registry 配置。\n`);
                 }
             }
             else if (process.stderr.isTTY) {
                 // Launcher alignment bridge (0.8.3): /update only replaces the
-                // package inside the DSH profile; a globally installed `dsh-tui`
+                // package inside the DSH profile; a globally installed `dsh-cli`
                 // launcher is a separate copy that keeps its old version. Launchers
-                // >=0.8.3 export DSH_TUI_LAUNCHER_VERSION so we can tell whether
+                // >=0.8.3 export DSH_CLI_LAUNCHER_VERSION so we can tell whether
                 // the outer launcher lags the freshly installed profile. Launchers
                 // <=0.8.2 never set the marker — the generic branch below is
-                // intentionally one-shot: DSH_TUI_UPDATED_FROM exists only on the
+                // intentionally one-shot: DSH_CLI_UPDATED_FROM exists only on the
                 // replacement process immediately after /update.
-                const launcherVersion = process.env.DSH_TUI_LAUNCHER_VERSION;
+                const launcherVersion = process.env.DSH_CLI_LAUNCHER_VERSION;
                 if (launcherVersion === undefined) {
-                    process.stderr.write(`\n[dsh-tui] ${t('update-launcher-align-unknown', { version: now })}\n`);
+                    process.stderr.write(`\n[dsh-cli] ${t('update-launcher-align-unknown', { version: now })}\n`);
                 }
                 else if (isVersionNewer(now, launcherVersion)) {
-                    process.stderr.write(`\n[dsh-tui] ${t('update-launcher-outdated', { profile: now, launcher: launcherVersion })}\n`);
+                    process.stderr.write(`\n[dsh-cli] ${t('update-launcher-outdated', { profile: now, launcher: launcherVersion })}\n`);
                 }
             }
         }
@@ -327,53 +327,53 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     // itself outside any worktree), so `@` completion and mention expansion
     // see the repository, not an arbitrary launch subdirectory. Resolved ONCE
     // here — the agent meta and the channel must agree.
-    const requestedWorkspace = config.workspace ?? process.env.DSH_TUI_WORKSPACE_TARGET;
+    const requestedWorkspace = config.workspace ?? process.env.DSH_CLI_WORKSPACE_TARGET;
     // Degraded boot (issue #183): a stale bundle patch without the
-    // dsh-tui-workspaces row leaves the service unmounted; resolve startup
+    // dsh-cli-workspaces row leaves the service unmounted; resolve startup
     // targets through the local-only runtime (provider URIs then fail loud
     // below instead of crashing on an undefined service). A profile launch
-    // without the service means the patch came from an older dsh-tui copy
+    // without the service means the patch came from an older dsh-cli copy
     // than the running code — warn once so the skew is diagnosable. Bare
     // embedders (no --profile) take the same fallback by design, silently.
     const mountedWorkspaceService = getHostWorkspaceRuntime(ctx.get('tuiWorkspaces'));
     if (mountedWorkspaceService === undefined && resolveDshProfileName() !== undefined) {
-        ctx.logger.warn('dsh-tui: tuiWorkspaces service is not mounted; /workspace runs with the local-only fallback. ' +
-            'The bundle patch is older than the installed dsh-tui package — update the globally installed dsh-tui launcher to match the profile (issue #183).');
+        ctx.logger.warn('dsh-cli: tuiWorkspaces service is not mounted; /workspace runs with the local-only fallback. ' +
+            'The bundle patch is older than the installed dsh-cli package — update the globally installed dsh-cli launcher to match the profile (issue #183).');
     }
     const workspaceService = mountedWorkspaceService ?? createLocalWorkspaceRuntime();
-    // Same skew guard for the plugin-scene registry (dsh-tui-scenes row): the
+    // Same skew guard for the plugin-scene registry (dsh-cli-scenes row): the
     // channel degrades to never opening scenes when the service is absent, so
     // say why on profile launches — a plugin's open() otherwise fails with only
     // its own warn to go on.
     if (ctx.get('tuiScenes') === undefined && resolveDshProfileName() !== undefined) {
-        ctx.logger.warn('dsh-tui: tuiScenes service is not mounted; plugin scenes will never open. ' +
-            'The bundle patch is older than the installed dsh-tui package — update the globally installed dsh-tui launcher to match the profile (issue #183).');
+        ctx.logger.warn('dsh-cli: tuiScenes service is not mounted; plugin scenes will never open. ' +
+            'The bundle patch is older than the installed dsh-cli package — update the globally installed dsh-cli launcher to match the profile (issue #183).');
     }
-    // Same skew guard for the plugin-UI services (dsh-tui-extensions row):
+    // Same skew guard for the plugin-UI services (dsh-cli-extensions row):
     // managed dialogs park unanswered, status contributions never render,
     // shortcuts never match, custom-entry renderers stay invisible, and runtime
     // themes stay out of the picker when the row is absent — say why on profile
     // launches. The static JSON theme path remains available without this row.
     const themeHost = getHostThemes(ctx.get('tuiThemes'));
     if ((ctx.get('tuiDialogs') === undefined || themeHost === undefined) && resolveDshProfileName() !== undefined) {
-        ctx.logger.warn('dsh-tui: tuiDialogs/tuiStatus/tuiShortcuts/tuiRenderers/tuiThemes services are not mounted; plugin dialogs, status contributions, shortcuts, custom-entry renderers and runtime themes are off. ' +
-            'Static ~/.dsh-tui/themes JSON remains available. The bundle patch is older than the installed dsh-tui package — update the globally installed dsh-tui launcher to match the profile (issue #183).');
+        ctx.logger.warn('dsh-cli: tuiDialogs/tuiStatus/tuiShortcuts/tuiRenderers/tuiThemes services are not mounted; plugin dialogs, status contributions, shortcuts, custom-entry renderers and runtime themes are off. ' +
+            'Static ~/.dsh-cli/themes JSON remains available. The bundle patch is older than the installed dsh-cli package — update the globally installed dsh-cli launcher to match the profile (issue #183).');
     }
-    // Same skew guard for the plugin-host row (dsh-tui-plugin-host): without
+    // Same skew guard for the plugin-host row (dsh-cli-plugin-host): without
     // it there is no runtime generation id, no unified grant store service,
     // and no Host Descriptor — plugin interop surfaces degrade silently
     // otherwise. The D-7 decision gate does NOT depend on this row (the
     // channel installs its own), so interception gating stays intact either
     // way — what breaks is everything that rides on tuiPluginHost.
     if (ctx.get('tuiPluginHost') === undefined && resolveDshProfileName() !== undefined) {
-        ctx.logger.warn('dsh-tui: tuiPluginHost service is not mounted; plugin grant store, runtime generation and Host Descriptor are unavailable. ' +
-            'The bundle patch is older than the installed dsh-tui package — update the globally installed dsh-tui launcher to match the profile (issue #183).');
+        ctx.logger.warn('dsh-cli: tuiPluginHost service is not mounted; plugin grant store, runtime generation and Host Descriptor are unavailable. ' +
+            'The bundle patch is older than the installed dsh-cli package — update the globally installed dsh-cli launcher to match the profile (issue #183).');
     }
     const initialWorkspace = requestedWorkspace === undefined
         ? undefined
         : await workspaceService.resolve(requestedWorkspace);
     if (requestedWorkspace !== undefined && initialWorkspace === undefined) {
-        throw new Error(`dsh-tui: unsupported or unavailable workspace target: ${requestedWorkspace}`);
+        throw new Error(`dsh-cli: unsupported or unavailable workspace target: ${requestedWorkspace}`);
     }
     const sessionCwd = initialWorkspace?.cwd ?? resolveSessionCwd(config.cwd);
     const meta = { cwd: sessionCwd };
@@ -396,14 +396,14 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
         // registration story.
         const attached = await attachSessionToWorkspace(ctx, meta.cwd, agent.session.id);
         if (!attached) {
-            ctx.logger.warn(`dsh-tui: session "${agent.session.id}" has no workspace ownership because workspaceRegistry is not mounted`);
+            ctx.logger.warn(`dsh-cli: session "${agent.session.id}" has no workspace ownership because workspaceRegistry is not mounted`);
         }
     }
     catch (error) {
         // The Session is already published and durable, matching Web's partial
         // failure contract. Keep the TUI usable but make the missing ownership
         // loud instead of silently leaving the conversation Ungrouped.
-        ctx.logger.warn(`dsh-tui: session "${agent.session.id}" workspace attachment failed: ${error instanceof Error ? error.message : String(error)}`);
+        ctx.logger.warn(`dsh-cli: session "${agent.session.id}" workspace attachment failed: ${error instanceof Error ? error.message : String(error)}`);
     }
     // Status-line route: the exact route the agent runs with — on create the
     // validated startup resolution, on resume the route the target session's
@@ -457,7 +457,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
         // plan/full cycle in sessionModes.ts).
         modes: config.modes,
         // Edit/Write diff presentation (schema default 'auto'); the /settings
-        // screen edits this key live through the dsh-tui namespace.
+        // screen edits this key live through the dsh-cli namespace.
         diffLayout: config.diffLayout,
         thinkingFold: config.thinkingFold,
         toolBackground: config.toolBackground,
@@ -524,7 +524,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     let bootedFullscreen = config.fullscreen === true;
     let bootedTerminalImages = lastBootedTerminalImages ?? config.terminalImages ?? true;
     let rendererSettingsFrozen = false;
-    const terminalImagesDisabledByEnv = isEnvTruthy(process.env.DSH_TUI_DISABLE_TERMINAL_IMAGES);
+    const terminalImagesDisabledByEnv = isEnvTruthy(process.env.DSH_CLI_DISABLE_TERMINAL_IMAGES);
     // The settings service may come up AFTER this plugin's apply: the cordis
     // inject callback defers until the service registers, so the first
     // `apply(scope.get())` below can land after the mount (field report: the
@@ -573,11 +573,11 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
         };
         // The /settings language field writes `lang` through the settings
         // service (user layer): apply it live and mirror it to lang.json so
-        // the /lang command and next-boot resolution agree. DSH_TUI_LANG
+        // the /lang command and next-boot resolution agree. DSH_CLI_LANG
         // stays the top precedence — a pinned env is never overridden by the
         // document.
         const applyLang = (value) => {
-            if (!isLang(process.env.DSH_TUI_LANG) && isLang(value.lang)) {
+            if (!isLang(process.env.DSH_CLI_LANG) && isLang(value.lang)) {
                 setLang(value.lang);
                 writeLangPref(value.lang);
             }
@@ -659,7 +659,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
         }));
         resolveSettingsReady?.();
     });
-    // The /settings screen's own section: the dsh-tui namespace comes from
+    // The /settings screen's own section: the dsh-cli namespace comes from
     // the settings registration above, and the declared selects write `lang`
     // and `diffLayout` back through the settings service's revision-fenced
     // mutate (the watch applies both live).
@@ -770,7 +770,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     });
     // Prefer the composition's sections service; fall back to the in-package
     // local host. Real compositions have been observed disposing the whole
-    // dsh-tui-* host-seam insert list right after load (issue #557), which
+    // dsh-cli-* host-seam insert list right after load (issue #557), which
     // left this registration silently skipped and /settings read-only.
     // channel.ts reads through the same fallback, so both sides meet in the
     // same registry either way.
@@ -778,7 +778,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
         const settingsSections = getHostSettingsSections(ctx.get('tuiSettingsSections')) ?? getLocalSettingsSectionsHost(ctx);
         const unregister = settingsSections.register({
             ns: tuiSettingsNs,
-            title: 'dsh-tui',
+            title: 'dsh-cli',
             groups: [
                 { id: 'status-bar', title: 'Status bar', descriptions: { zh: '底栏设置' } },
                 { id: 'shortcuts', title: 'Shortcuts', descriptions: { zh: '快捷键' } },
@@ -824,11 +824,11 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
                     label: terminalImagesDisabledByEnv ? 'Image previews (forced off)' : 'Terminal image previews',
                     descriptions: { zh: terminalImagesDisabledByEnv ? '图片预览（环境强制关闭）' : '终端图片预览' },
                     hint: terminalImagesDisabledByEnv
-                        ? 'Checkbox saves your preference. Relaunch without DSH_TUI_DISABLE_TERMINAL_IMAGES to enable previews.'
+                        ? 'Checkbox saves your preference. Relaunch without DSH_CLI_DISABLE_TERMINAL_IMAGES to enable previews.'
                         : 'Preview images in supported terminals. Use /restart to apply. Sending images is unaffected.',
                     hintDescriptions: {
                         zh: terminalImagesDisabledByEnv
-                            ? '勾选框保存预览偏好；移除 DSH_TUI_DISABLE_TERMINAL_IMAGES 后重新启动才能显示图片。'
+                            ? '勾选框保存预览偏好；移除 DSH_CLI_DISABLE_TERMINAL_IMAGES 后重新启动才能显示图片。'
                             : '在支持的终端中预览图片。修改后用 /restart 生效；不影响向模型发送图片。',
                     },
                     kind: 'boolean',
@@ -1233,7 +1233,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
         ctx.effect(() => () => herdr.dispose());
     }
     // Positional command-line arguments are the initial prompt (issue #53):
-    // `dsh-tui "run the tests"` forwards positionals through the dsh CLI,
+    // `dsh-cli "run the tests"` forwards positionals through the dsh CLI,
     // which mounts them as ctx.cmdlineArgs. The service shape drifted across
     // dsh-cmdline builds — `{ get() }` is the current contract, older builds
     // exposed `{ args }` — so read both. Submit once the channel exists;
@@ -1285,8 +1285,8 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
             exited = true;
             if (error !== undefined) {
                 const message = error instanceof Error ? error.message : String(error);
-                ctx.logger.error(`dsh-tui: exit after error: ${message}`);
-                void finishExit(ctx, instance, bootedFullscreen, undefined, `dsh-tui crashed: ${message}`, () => disposeRootAndExit(ctx, 1));
+                ctx.logger.error(`dsh-cli: exit after error: ${message}`);
+                void finishExit(ctx, instance, bootedFullscreen, undefined, `dsh-cli crashed: ${message}`, () => disposeRootAndExit(ctx, 1));
                 return;
             }
             if (updateRequested) {
@@ -1381,7 +1381,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
         approvalStore,
         injectControllerRef,
         openHomeOnBoot,
-        // The dsh-tui-extensions row's services (managed dialogs, status line,
+        // The dsh-cli-extensions row's services (managed dialogs, status line,
         // 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')),
@@ -1415,7 +1415,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
             // Confirm the target version before tearing the TUI down: on an
             // already-latest install, an unconditional update+restart would churn
             // the process and then trip the "version did not advance" warning.
-            void resolveTuiUpdateTarget().then((target) => {
+            void resolveCliUpdateTarget().then((target) => {
                 if (exited || updateRequested)
                     return;
                 if (target.kind === 'latest') {
@@ -1491,7 +1491,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     // /restart handoff diagnosis: the replacement got all the way to a mounted
     // UI, so any later death is post-boot (and its stderr keeps flowing to the
     // parent only within the survival window — this line is the durable mark).
-    if (process.env.DSH_TUI_RESTART_CHILD === '1') {
+    if (process.env.DSH_CLI_RESTART_CHILD === '1') {
         logRestartEvent('boot: UI mounted', { fullscreen: bootedFullscreen, isRecompose });
     }
     // External injection channel (dsh.nvim etc.): expose a per-session local
@@ -1501,7 +1501,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     const injectChannel = openInjectChannel(agent.session.id, channel.cwd, {
         append: (text) => injectControllerRef.current?.append(text),
         submit: () => injectControllerRef.current?.submit(),
-    }, (message) => ctx.logger.warn(`dsh-tui: ${message}`));
+    }, (message) => ctx.logger.warn(`dsh-cli: ${message}`));
     if (injectChannel) {
         ctx.effect(() => () => injectChannel.close());
     }
@@ -1517,7 +1517,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     // Check in the background so registry latency never delays the first frame.
     // A failed/offline check is intentionally silent; the manual `/update`
     // command remains available regardless of network access.
-    void checkForTuiUpdate().then((update) => {
+    void checkForCliUpdate().then((update) => {
         if (update === undefined || exited || updateRequested)
             return;
         const key = update.isStandalone ? 'update-standalone-available' : 'update-available';
@@ -1552,7 +1552,7 @@ export async function apply(ctx, runtimeConfig, configOwner = ctx) {
     void instance.waitUntilExit().then(handleExit, handleExit);
 }
 /**
- * Attach to an existing agent, resume a persisted session (`dsh-tui --resume`
+ * Attach to an existing agent, resume a persisted session (`dsh-cli --resume`
  * feeds the id through `config.sessionId`), or create a fresh one. Resume
  * goes through the DSH persistence seam (`ctx.agents.resume` reads the
  * session log written by dsh-session-persistence-jsonl); a missing artifact
@@ -1588,7 +1588,7 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
         }
         // The launch-time counterpart of the in-session `/resume` claim
         // (`channel/session-resume.ts`), and it has to happen before ANY await:
-        // without it `dsh-tui --resume <id>` mounts the log purely because the user
+        // without it `dsh-cli --resume <id>` mounts the log purely because the user
         // asked for it, so a second terminal doing the same joins the first and
         // both interleave writes into one append-only transcript. The mount
         // publisher cannot cover this — it publishes the set, it never refuses a
@@ -1603,15 +1603,15 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
         const reserved = await reserveMount(requestedSessionId);
         if (!reserved.ok) {
             if (reserved.reason === 'occupied') {
-                throw new Error(`dsh-tui: cannot resume session "${requestedSessionId}": it is mounted by another TUI terminal ` +
+                throw new Error(`dsh-cli: cannot resume session "${requestedSessionId}": it is mounted by another TUI terminal ` +
                     `(pid ${reserved.holders[0] ?? 0}) — two processes driving one session log would corrupt it. ` +
                     'Close that terminal, or drop --resume to start a fresh session.');
             }
             if (reserved.reason === 'busy') {
-                throw new Error(`dsh-tui: cannot resume session "${requestedSessionId}": another process is holding the ` +
+                throw new Error(`dsh-cli: cannot resume session "${requestedSessionId}": another process is holding the ` +
                     'session mount ledger right now, so its occupancy could not be checked. Retry in a moment.');
             }
-            throw new Error(`dsh-tui: cannot resume session "${requestedSessionId}": its occupancy could not be verified ` +
+            throw new Error(`dsh-cli: cannot resume session "${requestedSessionId}": its occupancy could not be verified ` +
                 `(${reserved.detail}). Refusing rather than risk two processes writing one session log. ` +
                 'If that file is damaged, remove it (and the matching .lock) while no other TUI is running, ' +
                 'or drop --resume to start a fresh session.');
@@ -1661,7 +1661,7 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
             // terminal). Fail the boot loudly instead; the loader surfaces this to
             // stderr. The in-session /resume picker has its own error path.
             const reason = error instanceof Error ? error.message : String(error);
-            throw new Error(`dsh-tui: cannot resume session "${requestedSessionId}": ${reason} — ` +
+            throw new Error(`dsh-cli: cannot resume session "${requestedSessionId}": ${reason} — ` +
                 'the stored log is unreadable or corrupt; no fresh session was started instead. ' +
                 'Drop --resume to start fresh, or repair the session log first.', { cause: error });
         }
@@ -1675,7 +1675,7 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
     const presetPref = configuredPreset === undefined ? readPresetPref() : undefined;
     const composed = await composePreset(ctx, configuredPreset ?? presetPref);
     if (!migratePresetPref(presetPref, composed.agentPreset)) {
-        ctx.logger.warn(`dsh-tui: resolved preset preference "${presetPref}" as "${composed.agentPreset}" but could not persist the migrated id`);
+        ctx.logger.warn(`dsh-cli: resolved preset preference "${presetPref}" as "${composed.agentPreset}" but could not persist the migrated id`);
     }
     // Fresh-session route precedence (issues #14/#30/#67): resolved atomically
     // by the caller (complete cordis.yml route > the persisted `/model` choice
@@ -1685,7 +1685,7 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
     const llm = ctx.get('llm');
     const { route, rejected } = await validateModelRoute(llm, startupRoute);
     if (rejected !== undefined) {
-        ctx.logger.warn(`dsh-tui: model route ${rejected.provider}/${rejected.model} is not advertised by provider "${rejected.provider}"; falling back to ${route.provider}/${route.model}`);
+        ctx.logger.warn(`dsh-cli: model route ${rejected.provider}/${rejected.model} is not advertised by provider "${rejected.provider}"; falling back to ${route.provider}/${route.model}`);
     }
     // Reserve the fresh id before the factory, exactly like the in-session
     // creates: from the moment `agents.create` returns this process holds the
@@ -1695,7 +1695,7 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
     // between the create and the next beat from being open.
     const bootReserved = await reserveMount(String(sessionId));
     if (!bootReserved.ok && bootReserved.reason !== 'occupied') {
-        ctx.logger.warn(`dsh-tui: could not announce the new session in the mount ledger: ${bootReserved.reason}`);
+        ctx.logger.warn(`dsh-cli: could not announce the new session in the mount ledger: ${bootReserved.reason}`);
     }
     const bootReservation = bootReserved.ok ? bootReserved.reservation : undefined;
     let created;
@@ -1716,7 +1716,7 @@ async function resolveAgent(ctx, requestedSessionId, configuredRoute, startupRou
         // Fail loud with the reason on stderr — a dead TUI with no message is
         // the worst outcome for a misconfigured leaf (unknown provider/model).
         const message = error instanceof Error ? error.message : String(error);
-        throw new Error(`dsh-tui: failed to create agent (provider=${route.provider}, model=${route.model}): ${message}`, { cause: error });
+        throw new Error(`dsh-cli: failed to create agent (provider=${route.provider}, model=${route.model}): ${message}`, { cause: error });
     }
     bootReservation?.settle();
     return { agent: created.agent, handle: created, agentPreset: composed.agentPreset, route };
@@ -1789,9 +1789,9 @@ export async function finishExit(ctx, instance, fullscreen, notice, stderrNotice
             ? undefined
             : fromHandle);
         if (runtime === undefined) {
-            ctx.logger.debug('dsh-tui: Ink runtime unavailable during shutdown; using generic terminal cleanup');
+            ctx.logger.debug('dsh-cli: Ink runtime unavailable during shutdown; using generic terminal cleanup');
             if (instance !== undefined) {
-                ctx.logger.debug('dsh-tui: Ink shutdown using full unmount as the terminal-restore fallback');
+                ctx.logger.debug('dsh-cli: Ink shutdown using full unmount as the terminal-restore fallback');
                 // Lookup-miss (custom stdout embedders / detach-less handles): the
                 // registry cannot hand us the detach hooks, so run the full Ink
                 // unmount first. It restores raw mode, alt screen and listeners
@@ -1801,12 +1801,12 @@ export async function finishExit(ctx, instance, fullscreen, notice, stderrNotice
                     instance.unmount();
                 }
                 catch {
-                    ctx.logger.debug('dsh-tui: Ink shutdown unmount fallback failed; continuing with generic terminal cleanup');
+                    ctx.logger.debug('dsh-cli: Ink shutdown unmount fallback failed; continuing with generic terminal cleanup');
                 }
             }
         }
         else if (fromMap === undefined) {
-            ctx.logger.debug('dsh-tui: Ink runtime resolved from the render handle (instances map missed); detaching');
+            ctx.logger.debug('dsh-cli: Ink runtime resolved from the render handle (instances map missed); detaching');
         }
         const cursor = fullscreen ? '' : cursorMoveToFrameEnd(runtime);
         try {
@@ -1818,7 +1818,7 @@ export async function finishExit(ctx, instance, fullscreen, notice, stderrNotice
             runtime?.detachStdinForHandoff?.();
         }
         catch {
-            ctx.logger.debug('dsh-tui: Ink shutdown detach failed; continuing with generic terminal cleanup');
+            ctx.logger.debug('dsh-cli: Ink shutdown detach failed; continuing with generic terminal cleanup');
         }
         const cleanup = [
             fullscreen ? EXIT_ALT_SCREEN : '',
@@ -1850,7 +1850,7 @@ export async function finishExit(ctx, instance, fullscreen, notice, stderrNotice
         }
     }
     catch {
-        ctx.logger.debug('dsh-tui: terminal cleanup failed; continuing with process shutdown');
+        ctx.logger.debug('dsh-cli: terminal cleanup failed; continuing with process shutdown');
     }
     // Filesystem-only: the exported clipboard images live in a per-process
     // temp directory that nothing else removes.
@@ -1928,18 +1928,18 @@ function writeStream(stream, data) {
 function runRestart(ctx, profile, sessionId) {
     logRestartEvent('runRestart: entered, disposing cordis root');
     disposeRootAndThen(ctx, () => {
-        logRestartEvent('runRestart: root disposed, starting restartTui');
-        void restartTui(sessionId).then(restartCode => {
-            logRestartEvent('runRestart: restartTui resolved', { restartCode });
+        logRestartEvent('runRestart: root disposed, starting restartCli');
+        void restartCli(sessionId).then(restartCode => {
+            logRestartEvent('runRestart: restartCli resolved', { restartCode });
             if (restartCode !== 0) {
-                writeHandoffNotice(`\ndsh-tui restart failed to spawn (exit ${restartCode}). Your session is preserved — resume with:\n` +
+                writeHandoffNotice(`\ndsh-cli restart failed to spawn (exit ${restartCode}). Your session is preserved — resume with:\n` +
                     `${resumeCommand(profile, sessionId)}\n\n`);
             }
             process.exit(restartCode);
         }, restartError => {
             const message = restartError instanceof Error ? restartError.message : String(restartError);
-            logRestartEvent('runRestart: restartTui rejected', { message });
-            writeHandoffNotice(`\ndsh-tui restart failed: ${message}. Your session is preserved — resume with:\n` +
+            logRestartEvent('runRestart: restartCli rejected', { message });
+            writeHandoffNotice(`\ndsh-cli restart failed: ${message}. Your session is preserved — resume with:\n` +
                 `${resumeCommand(profile, sessionId)}\n\n`);
             process.exit(1);
         });
@@ -1951,15 +1951,15 @@ function runUpdate(ctx, profile, sessionId, targetVersion) {
             process.stderr.write(`\n${t('update-aborted-no-profile')}\n`);
             process.exit(1);
         }
-        void updateTuiAndRestart(sessionId, profile, targetVersion).then(({ updateCode, restartCode }) => {
+        void updateCliAndRestart(sessionId, profile, targetVersion).then(({ updateCode, restartCode }) => {
             if (updateCode !== 0) {
-                process.stderr.write(`\ndsh-tui update failed (exit ${updateCode}). Your session is preserved — resume with:\n` +
+                process.stderr.write(`\ndsh-cli update failed (exit ${updateCode}). Your session is preserved — resume with:\n` +
                     `${resumeCommand(profile, sessionId)}\n\n`);
             }
             process.exit(restartCode);
         }, updateError => {
             const message = updateError instanceof Error ? updateError.message : String(updateError);
-            process.stderr.write(`\ndsh-tui update failed: ${message}. Your session is preserved — resume with:\n` +
+            process.stderr.write(`\ndsh-cli update failed: ${message}. Your session is preserved — resume with:\n` +
                 `${resumeCommand(profile, sessionId)}\n\n`);
             process.exit(1);
         });
@@ -1968,11 +1968,11 @@ function runUpdate(ctx, profile, sessionId, targetVersion) {
 /** Deferred runtime failures must restore the terminal and fail the process. */
 export function handleStartupError(ctx, error) {
     const message = error instanceof Error ? error.message : String(error);
-    void finishExit(ctx, undefined, lastBootedFullscreen ?? true, undefined, `dsh-tui startup failed: ${message}`, () => disposeRootAndExit(ctx, 1));
+    void finishExit(ctx, undefined, lastBootedFullscreen ?? true, undefined, `dsh-cli startup failed: ${message}`, () => disposeRootAndExit(ctx, 1));
 }
 /**
  * Dispose the whole application before process exit, with a bounded fallback.
- * Mirrors the deleted dsh-tui front-door exit semantics.
+ * Mirrors the deleted dsh-cli front-door exit semantics.
  */
 function disposeRootAndExit(ctx, code) {
     disposeRootAndThen(ctx, () => process.exit(code), code);

package/lib/types/dsh-adapter/preset-resolution.d.ts

@@ -9,7 +9,7 @@ export interface AgentPresetInfo {
     /** Present when the preset cannot compose a session (human-readable). */
     readonly broken?: string;
 }
-/** The `ctx.agentPresets` service surface dsh-tui consumes. */
+/** The `ctx.agentPresets` service surface dsh-cli consumes. */
 export interface AgentPresetsLike {
     readonly defaultId: string;
     list(): Promise<readonly AgentPresetInfo[]>;

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

@@ -39,7 +39,7 @@ export async function composePreset(ctx, requested) {
         resolvedId = (await presets.resolve(requested)).id;
     }
     catch (error) {
-        ctx.logger.warn(`dsh-tui: agent preset ${requested === undefined ? '(default)' : `"${requested}"`} unavailable ` +
+        ctx.logger.warn(`dsh-cli: agent preset ${requested === undefined ? '(default)' : `"${requested}"`} unavailable ` +
             `(${error instanceof Error ? error.message : String(error)}) — composing the session without a preset`);
         return {};
     }

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

@@ -133,7 +133,7 @@ export function registerPromptDebug(ctx) {
                 schemaVersion: 2,
                 generatedAt: new Date().toISOString(),
                 captureStartedAt,
-                captureScope: 'Requests observed by this dsh-tui process; requests from before a session resume cannot be reconstructed.',
+                captureScope: 'Requests observed by this dsh-cli process; requests from before a session resume cannot be reconstructed.',
                 warning: 'Sensitive debug data: contains system prompts, conversation messages, tool schemas, and tool results. It intentionally excludes credentials and transport headers.',
                 sessionId,
                 turnCount: turns.size,

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

@@ -7,7 +7,7 @@
  * harness promise when the user answers,
  * cancels, or the owning tool's abort signal fires.
  *
- * Queue semantics mirror the official dsh-tui chat/questions machine: asks
+ * Queue semantics mirror the official dsh-cli chat/questions machine: asks
  * arrive one at a time in practice (the tool blocks until answered), but
  * concurrent asks from subagents are drained FIFO.
  */

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

@@ -7,7 +7,7 @@
  * harness promise when the user answers,
  * cancels, or the owning tool's abort signal fires.
  *
- * Queue semantics mirror the official dsh-tui chat/questions machine: asks
+ * Queue semantics mirror the official dsh-cli chat/questions machine: asks
  * arrive one at a time in practice (the tool blocks until answered), but
  * concurrent asks from subagents are drained FIFO.
  */