@agi-fans/dsh-tui 0.20.0 → 0.22.0

package/lib/runtime/plain-tui.js

@@ -101,7 +101,13 @@ export class PlainTui {
         let out = '';
         for (const block of blocks.slice(this.#printed)) {
             // Pipe / CI output is not a viewport: print the full tool body.
-            for (const line of blockLines(block, theme, width, { toolsExpanded: true, mathMode: this.#deps.mathMode?.() ?? 'auto', mermaidMode: this.#deps.mermaidMode?.() ?? 'auto' }))
+            for (const line of blockLines(block, theme, width, {
+                toolsExpanded: true,
+                mathMode: this.#deps.mathMode?.() ?? 'auto',
+                mermaidMode: this.#deps.mermaidMode?.() ?? 'auto',
+                hideThinking: this.#deps.hideThinking?.() === true,
+                thinkingOpen: this.#deps.hideThinking?.() !== true,
+            }))
                 out += line + '\n';
         }
         this.#printed = blocks.length;

package/lib/runtime/plain-tui.js.map

@@ -1 +1 @@
-{"version":3,"file":"plain-tui.js","sourceRoot":"","sources":["../../src/runtime/plain-tui.ts"],"names":[],"mappings":"AAAA,8DAA8D;AAE9D,OAAO,EAAE,eAAe,EAAkB,MAAM,eAAe,CAAA;AAG/D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAsBhD;;;;GAIG;AACH,MAAM,OAAO,QAAQ;IACV,KAAK,CAAc;IAC5B,WAAW,GAAqB,IAAI,CAAA;IACpC,QAAQ,GAAuB,IAAI,CAAA;IAC1B,MAAM,GAAa,EAAE,CAAA;IAC9B,OAAO,GAAG,KAAK,CAAA;IACf,QAAQ,GAAG,CAAC,CAAA;IAEZ,YAAY,IAAkB;QAC5B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;IACnB,CAAC;IAED,QAAQ,CAAC,MAAoB;QAC3B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;gBAC9B,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;gBACpE,kEAAkE;gBAClE,gDAAgD;gBAChD,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;gBAC1E,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;oBAChC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;oBACnB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;gBACzB,CAAC,CAAC,CAAA;YACJ,CAAC;YACD,MAAM,OAAO,GAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI,EAAE,CAAA;YAChE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;YACvB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,GAAS,EAAE;oBACzB,IAAI,IAAI,CAAC,QAAQ,KAAK,OAAO;wBAAE,OAAM;oBACrC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;oBACpB,OAAO,CAAC,IAAI,CAAC,CAAA;gBACf,CAAC,CAAA;gBACD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;gBACzD,OAAO,CAAC,QAAQ,GAAG,GAAG,EAAE,GAAG,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA,CAAC,CAAC,CAAA;YAC3E,CAAC;YACD,IAAI,CAAC,KAAK,EAAE,CAAA;QACd,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,IAAmB;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAA;QAC1C,IAAI,OAAO,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;YACzB,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;gBACjB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;YACjE,CAAC;iBAAM,IAAI,OAAO,CAAC,WAAW,KAAK,KAAK,EAAE,CAAC;gBACzC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAA;gBACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC7D,MAAM,MAAM,GAAG,OAAO,IAAI,CAAC;oBACzB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;oBAClB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;gBAC1E,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,IAAI,MAAM,EAAE,KAAK,IAAI,IAAI,CAAC,CAAA;YACjE,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;YAChC,CAAC;YACD,OAAM;QACR,CAAC;QACD,IAAI,OAAO,KAAK,SAAS;YAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QACxD,IAAI,IAAI,KAAK,IAAI;YAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACzC,IAAI,CAAC,KAAK,EAAE,CAAA;IACd,CAAC;IAED,8EAA8E;IAC9E,KAAK;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC7B,IAAI,OAAO,KAAK,IAAI;YAAE,OAAM;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;QAChC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAA;YACpB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;YACpB,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAA;YAC3C,OAAM;QACR,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAA;YACpB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;YACpB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACvB,CAAC;IACH,CAAC;IAED,sDAAsD;IACtD,KAAK;QACH,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,CAAA;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAA;QAClC,IAAI,GAAG,GAAG,EAAE,CAAA;QACZ,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChD,gEAAgE;YAChE,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,IAAI,MAAM,EAAE,CAAC;gBAAE,GAAG,IAAI,IAAI,GAAG,IAAI,CAAA;QACjM,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAA;QAC7B,IAAI,GAAG,KAAK,EAAE;YAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACnD,CAAC;IAED,yEAAyE;IACzE,YAAY;QACV,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAA;IACnB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,CAAA;IAC3B,CAAC;CACF"}
+{"version":3,"file":"plain-tui.js","sourceRoot":"","sources":["../../src/runtime/plain-tui.ts"],"names":[],"mappings":"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"}

package/lib/runtime/plugin-settings.d.ts

@@ -1,7 +1,21 @@
 /** Schema-driven configuration using path edits and revision-checked writes. */
 import type { Context } from '@deepseek-ai/cordis';
+import type { BundleInfo } from '@deepseek-ai/dsh-plugin-manager';
 import z from '@deepseek-ai/schemastery';
 import type { PluginSettingsEntry } from '../views/settings-list.ts';
+import type { TuiService } from '../definition.ts';
+interface ProductForm {
+    label: string;
+    section: NonNullable<PluginSettingsEntry['section']>;
+    fields: Record<string, string>;
+    inline?: string;
+    effect?: string;
+}
+export declare function nativeIntegrationId(bundle: string): string | undefined;
+/** A failed user action needs acknowledgement before its covering form reopens. */
+export declare function showSettingsError(tui: Pick<TuiService, 'notice' | 'prompt'>, detail: string, signal?: AbortSignal): Promise<void>;
+/** Diagnostics are a result: they go to the transcript, folded when long. */
+export declare function showIntegrationStatus(ctx: Context, bundle: string, signal: AbortSignal): Promise<void>;
 export interface ConfigField {
     path: string[];
     schema: z;
@@ -13,5 +27,14 @@ export interface ConfigField {
 export declare function configFields(schema: z, path?: string[]): ConfigField[];
 export declare function configValue(value: unknown, path: readonly string[]): unknown;
 export declare function parseConfigValue(field: ConfigField, text: string): unknown;
-export declare function pluginSettingsEntries(ctx: Context): PluginSettingsEntry[];
-export declare function editPluginSettings(ctx: Context, ns: string, signal: AbortSignal): Promise<void>;
+/** Human units are presentation only; owner schemas still validate the stored numbers. */
+export declare function fieldDisplay(field: ConfigField, value: unknown): string;
+export declare function pluginSettingsEntries(ctx: Context, bundles?: readonly BundleInfo[]): PluginSettingsEntry[];
+/** Write the displayed snapshot's revision; a concurrent change must never be silently overwritten. */
+export declare function setSettingsEntry(ctx: Context, entry: PluginSettingsEntry, choice: string, signal: AbortSignal): Promise<void>;
+/** Route a product row to its original owner; installation remains in /plugins. */
+export declare function editSettingsEntry(ctx: Context, id: string, signal: AbortSignal, resetOnly?: boolean): Promise<void>;
+/** Restore only the chosen owner fields, fenced to the configuration shown by the confirmation. */
+export declare function resetSettingsControl(ctx: Context, id: string, entry: PluginSettingsEntry | undefined, signal: AbortSignal, label?: string): Promise<void>;
+export declare function editPluginSettings(ctx: Context, ns: string, signal: AbortSignal, allowedFields?: readonly string[], presentation?: Pick<ProductForm, 'label' | 'fields'>, resetOnly?: boolean): Promise<void>;
+export {};

package/lib/runtime/plugin-settings.js

@@ -2,6 +2,67 @@
 import { randomUUID } from 'node:crypto';
 import { credentialRef } from '@deepseek-ai/dsh-credentials';
 import z from '@deepseek-ai/schemastery';
+import { externalAgentDiagnostic, externalAgentGuide } from "../session/external-agents.js";
+import { preferencePaths } from "./settings-preferences.js";
+import { resolveStatusBarConfig } from "../chrome/status-config.js";
+const SHELL_FORM = { label: 'Shell', section: 'tools', fields: { timeoutMs: 'Default timeout', maxTimeoutMs: 'Maximum timeout', maxOutputBytes: 'Output limit', maxSpillBytes: 'Retained output limit', graceMs: 'Shutdown grace' } };
+// Presentation only: values, validation, inheritance and writes belong to each live schema.
+const PRODUCT_FORMS = {
+    'agent-loop': { label: 'Tool parallelism', section: 'tools', fields: { maxParallelToolCalls: 'Parallel tool calls' } },
+    subagent: { label: 'Subagents', section: 'agent', fields: { maxDepth: 'Delegation depth', maxActiveSubagents: 'Concurrent subagents' } },
+    'subagent-model-selection-settings': { label: 'Subagent models', section: 'agent', fields: { enabled: 'Model selection', allowedModels: 'Allowed models' }, inline: 'enabled', effect: 'Applies to new sessions; existing sessions keep their routes.' },
+    bash: SHELL_FORM,
+    pwsh: SHELL_FORM,
+    'file-recovery': { label: 'File recovery snapshots', section: 'tools', fields: { enabled: 'Snapshots' }, inline: 'enabled', effect: 'Keeps private file contents. Changes apply to the next Turn; existing snapshots remain readable.' },
+    'hook-settings': { label: 'Command hooks', section: 'integrations', fields: { bridge: 'Hook compatibility', configPath: 'Configuration file' }, inline: 'bridge' },
+    web: { label: 'Web providers', section: 'integrations', fields: { searchProvider: 'Search provider', fetchProvider: 'Fetch provider' },
+        effect: 'Default: deepseek-search-api and deepseek-fetch-api. Fallbacks: deepseek-official (Messages) and http (local). With more than one provider installed, an empty value is ambiguous.' },
+    'web-deepseek-api': { label: 'Web search · API', section: 'integrations',
+        fields: { apiKey: 'API key', apiKeyEnv: 'API key reference', baseURL: 'Endpoint', count: 'Results per search', sendOriginalQuestion: 'Send original question' },
+        effect: 'Default search and fetch provider: one direct DeepSeek API request without an auxiliary model turn. /login stores the official key under this reference.' },
+    'web-search-deepseek': { label: 'Web search · Messages', section: 'integrations',
+        fields: { maxTokens: 'Token limit', maxUses: 'Search limit', apiKey: 'API key', apiKeyEnv: 'API key reference', baseURL: 'Endpoint', model: 'Model', apiVersion: 'API version' },
+        effect: 'Fallback search provider: one auxiliary Messages turn. Select it under Web providers.' },
+};
+// Already represented by dedicated controls, or accepted solely for migration.
+const DEDICATED_FIELDS = {
+    tui: ['theme', 'colors', 'motion', 'mathMode', 'mermaidMode', 'editor', 'terminalTitle', 'terminalState', 'pasteProtection', 'copyOnSelect', 'mouseInteraction', 'checkUpdates', 'startupChangelog', 'notifications', 'notificationFocus', 'notificationThreshold', 'statusBar', 'foldDensity', 'expandTools', 'statusPreset'],
+    'agent-behavior': ['language'],
+    // A deployment without the working-directory service may still set these in
+    // its profile; normal sessions always run in the Session's current directory.
+    bash: ['cwd'],
+    pwsh: ['cwd'],
+    'subagent-codex': ['model', 'permissionMode', 'env'],
+    'subagent-claude-code': ['model', 'permissionMode', 'env'],
+};
+const NATIVE_INTEGRATIONS = [
+    { id: 'integration:codex', label: 'Codex', bundle: '@deepseek-ai/dsh-subagent-codex' },
+    { id: 'integration:claude', label: 'Claude Code', bundle: '@deepseek-ai/dsh-subagent-claude-code' },
+];
+export function nativeIntegrationId(bundle) {
+    return NATIVE_INTEGRATIONS.find(item => item.bundle === bundle)?.id;
+}
+/** A failed user action needs acknowledgement before its covering form reopens. */
+export async function showSettingsError(tui, detail, signal) {
+    if (signal?.aborted)
+        return;
+    tui.notice(detail, { level: 'error' });
+    await tui.prompt({ title: 'Settings', question: 'Could not change configuration', detail,
+        options: [{ label: 'Return to settings' }], allowCustom: false, notify: false,
+        ...(signal === undefined ? {} : { signal }) });
+}
+/** Diagnostics are a result: they go to the transcript, folded when long. */
+export async function showIntegrationStatus(ctx, bundle, signal) {
+    const manager = ctx.get('pluginManager');
+    if (manager === undefined || signal.aborted)
+        return;
+    const row = (await manager.listBundles()).find(row => row.name === bundle);
+    const text = row === undefined ? 'This integration is no longer registered in this profile.'
+        : externalAgentDiagnostic(row, await manager.listPlugins());
+    if (signal.aborted)
+        return;
+    ctx.tui.commandOutput(`${NATIVE_INTEGRATIONS.find(item => item.bundle === bundle)?.label ?? bundle} · Status`, text);
+}
 function containsSecret(schema, seen = new Set()) {
     if (seen.has(schema))
         return false;
@@ -11,7 +72,7 @@ function containsSecret(schema, seen = new Set()) {
 }
 /** Flatten ordinary objects while retaining arrays and unions as atomic fields. */
 export function configFields(schema, path = []) {
-    if (schema.meta.hidden || schema.meta.disabled)
+    if (schema.meta.hidden || schema.meta.disabled || schema.meta.badges?.some(badge => badge.text === 'deprecated'))
         return [];
     if (schema.type === 'object')
         return Object.entries(schema.dict ?? {}).flatMap(([key, child]) => configFields(child, [...path, key]));
@@ -45,12 +106,12 @@ function credentialPath(field, fields) {
     const path = [...field.path.slice(0, -1), 'apiKeyEnv'];
     return field.secret && field.path.at(-1) === 'apiKey' && fields.some(item => item.path.join('.') === path.join('.')) ? path : undefined;
 }
-function fieldDescription(section, field, fields) {
+function fieldDescription(section, field, fields, human = false) {
     const refPath = credentialPath(field, fields);
     const reference = refPath === undefined ? undefined : configValue(section.value, refPath);
     const inline = section.secrets?.find(secret => secret.path.join('.') === field.path.join('.'))?.set;
     const value = field.secret ? `secret · ${inline ? 'configured' : typeof reference === 'string' && reference !== '' ? 'credential reference configured' : 'not set'}`
-        : field.protected ? 'protected · use /auth or the owner configuration' : display(configValue(section.value, field.path));
+        : field.protected ? 'protected · use /login or the owner configuration' : human ? fieldDisplay(field, configValue(section.value, field.path)) : display(configValue(section.value, field.path));
     const override = hasOverride(section.user, field.path) || refPath !== undefined && hasOverride(section.user, refPath);
     const help = field.schema.meta.description;
     return `${value} · ${override ? 'profile override' : 'inherited'}${typeof help === 'string' && help !== '' ? ` · ${help}` : ''}`;
@@ -60,39 +121,221 @@ export function parseConfigValue(field, text) {
     field.schema(value);
     return value;
 }
-const list = { presentation: 'fullscreen-list', optionLayout: 'compact', filterable: true, allowCustom: false };
-export function pluginSettingsEntries(ctx) {
-    return ctx.settings.describe({ redactSecrets: true }).flatMap(section => {
+const list = { presentation: 'card', filterable: true, allowCustom: false, notify: false };
+function constantValues(field) {
+    return field.schema.type === 'boolean' ? [true, false] : field.schema.type === 'union'
+        && field.schema.list?.every(child => child.type === 'const') ? field.schema.list.map(child => child.value) : undefined;
+}
+function choiceLabel(value) {
+    return typeof value === 'boolean' ? value ? 'On' : 'Off' : display(value);
+}
+/** Human units are presentation only; owner schemas still validate the stored numbers. */
+export function fieldDisplay(field, value) {
+    if (value === undefined || value === null)
+        return '—';
+    if (typeof value === 'boolean')
+        return choiceLabel(value);
+    if (typeof value !== 'number')
+        return display(value);
+    const name = field.path.at(-1) ?? '';
+    if (name.endsWith('Ms'))
+        return value !== 0 && value % 60_000 === 0 ? `${value / 60_000}m` : value !== 0 && value % 1000 === 0 ? `${value / 1000}s` : `${value}ms`;
+    if (name.endsWith('Bytes')) {
+        for (const [unit, factor] of [['GiB', 1024 ** 3], ['MiB', 1024 ** 2], ['KiB', 1024]])
+            if (value !== 0 && value % factor === 0)
+                return `${value / factor} ${unit}`;
+        return `${value} B`;
+    }
+    return display(value);
+}
+function parseProductValue(field, text) {
+    if (field.schema.type === 'number') {
+        const match = /^\s*(\d+(?:\.\d+)?)\s*([a-z]+)\s*$/iu.exec(text);
+        const factors = (field.path.at(-1) ?? '').endsWith('Ms') ? { ms: 1, s: 1000, m: 60_000, h: 3_600_000 }
+            : (field.path.at(-1) ?? '').endsWith('Bytes') ? { b: 1, kb: 1000, mb: 1000 ** 2, gb: 1000 ** 3, kib: 1024, mib: 1024 ** 2, gib: 1024 ** 3 } : {};
+        const factor = match === null ? undefined : factors[match[2].toLowerCase()];
+        if (match !== null && factor !== undefined) {
+            const value = Number(match[1]) * factor;
+            field.schema(value);
+            return value;
+        }
+    }
+    return parseConfigValue(field, text);
+}
+export function pluginSettingsEntries(ctx, bundles) {
+    const entries = ctx.settings.describe({ redactSecrets: true }).flatMap(section => {
         const fields = configFields(new z(section.schema));
-        const label = String(section.ns).replace(/[-_]+/gu, ' ').replace(/^./u, first => first.toUpperCase());
-        return fields.length === 0 ? [] : [{ id: String(section.ns), label,
-                description: `${section.ns} · ${fields.length} fields · ${ctx.settings.writable ? 'Edits apply live to this profile; Esc returns to Settings.' : 'This profile is read-only.'}` }];
+        const ns = String(section.ns), form = Object.hasOwn(PRODUCT_FORMS, ns) ? PRODUCT_FORMS[ns] : undefined;
+        const paths = fields.map(field => field.path.join('.'));
+        const claimed = [...(Object.hasOwn(DEDICATED_FIELDS, ns) ? DEDICATED_FIELDS[ns] ?? [] : []), ...Object.keys(form?.fields ?? {})];
+        const owned = paths.filter(path => Object.hasOwn(form?.fields ?? {}, path));
+        const advanced = section.autoGenerate === false ? [] : paths.filter(path => !claimed.includes(path));
+        const writable = ctx.settings.writable ? 'Edits apply live to this profile.' : 'This profile is read-only.';
+        const summary = fields.filter(field => owned.includes(field.path.join('.')) && !field.secret && !field.protected
+            && configValue(section.value, field.path) !== undefined).slice(0, 2)
+            .map(field => `${form?.fields[field.path.join('.')]}: ${Array.isArray(configValue(section.value, field.path)) ? `${configValue(section.value, field.path).length} selected` : fieldDisplay(field, configValue(section.value, field.path))}`).join(' · ');
+        const field = fields.find(field => field.path.join('.') === form?.inline);
+        const values = field === undefined || field.secret || field.protected ? undefined : constantValues(field);
+        // A field with a schema default is already in effect, so the row shows that
+        // value rather than "not set": the reader's choice is what the schema says it
+        // is, and an unset override is not a third state.
+        const effective = field === undefined ? undefined
+            : configValue(section.value, field.path) ?? field.schema.meta.default;
+        const inline = field === undefined || values === undefined || values.length === 0 ? undefined : {
+            path: field.path, revision: section.revision, value: choiceLabel(effective),
+            choices: ctx.settings.writable ? values.map(value => ({ label: choiceLabel(value), value: JSON.stringify(value) })) : [],
+        };
+        return [
+            ...(form === undefined || owned.length === 0 ? [] : [{ id: ns, namespace: ns, label: form.label, section: form.section, fields: owned,
+                    ...(inline === undefined ? {} : { inline }), summary, keywords: [...owned, ...Object.values(form.fields)],
+                    description: `${form.effect === undefined ? '' : `${form.effect} `}${field === undefined ? '' : `${fieldDescription(section, field, fields)} · `}${writable}` }]),
+            ...(advanced.length === 0 ? [] : [{ id: `advanced:${ns}`, namespace: ns,
+                    label: String(section.ns).replace(/[-_]+/gu, ' ').replace(/^./u, first => first.toUpperCase()), section: 'advanced', fields: advanced,
+                    summary: `${advanced.length} fields`, keywords: advanced, description: `${ns} · ${advanced.length} fields · ${writable}` }]),
+        ];
     });
+    if (ctx.get('pluginManager') !== undefined)
+        entries.push(...NATIVE_INTEGRATIONS.map(item => {
+            const bundle = bundles?.find(bundle => bundle.name === item.bundle);
+            return { id: item.id, label: item.label, section: 'integrations', fields: [],
+                summary: bundles === undefined ? 'Details' : bundle === undefined || bundle.availability === 'missing' ? 'Unavailable' : bundle.error !== undefined ? 'Load error' : bundle.enabled ? 'Enabled' : 'Disabled',
+                description: 'Provider model, permissions and profile enablement. Native login has not been checked; Installation status reports registration.' };
+        }));
+    return entries;
+}
+/** Write the displayed snapshot's revision; a concurrent change must never be silently overwritten. */
+export async function setSettingsEntry(ctx, entry, choice, signal) {
+    signal.throwIfAborted();
+    const inline = entry.inline;
+    if (!ctx.settings.writable)
+        throw new Error('This profile is read-only.');
+    if (entry.namespace === undefined || inline === undefined || !inline.choices.some(item => item.value === choice))
+        throw new Error('This setting is no longer editable. Refresh and retry.');
+    const section = ctx.settings.describe({ redactSecrets: true }).find(item => item.ns === entry.namespace);
+    if (section === undefined || section.revision !== inline.revision)
+        throw new Error('Configuration changed. Refresh and retry.');
+    const form = Object.hasOwn(PRODUCT_FORMS, entry.namespace) ? PRODUCT_FORMS[entry.namespace] : undefined;
+    const field = configFields(new z(section.schema)).find(field => field.path.join('.') === inline.path.join('.') && field.path.join('.') === form?.inline);
+    if (field === undefined || field.secret || field.protected)
+        throw new Error('This setting is no longer editable. Refresh and retry.');
+    await saveValue(ctx, section, field, parseConfigValue(field, choice));
+    ctx.tui.notice(`${form?.fields[field.path.join('.')] ?? entry.label}: saved.`);
+}
+/** Route a product row to its original owner; installation remains in /plugins. */
+export async function editSettingsEntry(ctx, id, signal, resetOnly = false) {
+    const native = NATIVE_INTEGRATIONS.find(item => item.id === id);
+    if (native !== undefined) {
+        const manager = ctx.get('pluginManager');
+        if (manager === undefined)
+            return;
+        while (!signal.aborted) {
+            const row = (await manager.listBundles()).find(row => row.name === native.bundle);
+            if (row === undefined || row.availability === 'missing') {
+                await showSettingsError(ctx.tui, `${native.label} is unavailable. Open /plugins → Bundles to install or repair its package.`, signal);
+                return;
+            }
+            const ns = row.rows.find(item => item.moduleName === row.name)?.rowId;
+            const configurable = ns !== undefined && ctx.get('settings')?.describe({ redactSecrets: true }).some(section => section.ns === ns);
+            const action = await ctx.tui.prompt({ ...list, title: native.label, question: row.enabled ? 'Enabled' : 'Disabled',
+                detail: [row.error === undefined ? undefined : `Load error: ${row.error.diagnostic ?? row.error.code}`, externalAgentGuide(row.name)].filter(Boolean).join('\n\n'), options: [{ label: row.enabled ? 'Disable integration' : 'Enable integration', value: 'toggle' },
+                    ...(configurable ? [{ label: 'Model', value: 'field:model' }, { label: 'Permissions', value: 'field:permissionMode' }] : []), ...(configurable ? [{ label: 'Restore inherited model or permissions…', value: 'restore' }] : []), { label: 'Installation status', value: 'check' }], notify: false, signal });
+            if (action === null || signal.aborted)
+                return;
+            if (action === 'toggle') {
+                const result = await manager.setBundleEnabled(row.name, !row.enabled);
+                if (result.error !== undefined || result.application === 'failed')
+                    await showSettingsError(ctx.tui, result.error?.diagnostic ?? result.error?.code ?? 'Could not change integration.', signal);
+                else
+                    ctx.tui.notice(`${native.label}: ${result.application}${result.enabled === undefined ? '' : result.enabled ? ' · enabled' : ' · disabled'}.`);
+            }
+            if (action.startsWith('field:') && configurable && ns !== undefined)
+                await editPluginSettings(ctx, ns, signal, [action.slice(6)], { label: native.label, fields: { model: 'Model', permissionMode: 'Permissions' } });
+            if (action === 'restore' && configurable && ns !== undefined)
+                await editPluginSettings(ctx, ns, signal, ['model', 'permissionMode'], { label: native.label, fields: { model: 'Model', permissionMode: 'Permissions' } }, true);
+            if (action === 'check')
+                await showIntegrationStatus(ctx, row.name, signal);
+        }
+        return;
+    }
+    const entry = pluginSettingsEntries(ctx).find(entry => entry.id === id);
+    if (entry?.namespace === undefined)
+        return;
+    await editPluginSettings(ctx, entry.namespace, signal, entry.fields, entry.section === 'advanced' ? undefined : PRODUCT_FORMS[entry.namespace], resetOnly);
+}
+/** Restore only the chosen owner fields, fenced to the configuration shown by the confirmation. */
+export async function resetSettingsControl(ctx, id, entry, signal, label = entry?.label ?? id) {
+    if (entry !== undefined && entry.inline === undefined) {
+        await editSettingsEntry(ctx, entry.id, signal, true);
+        return;
+    }
+    const ns = entry?.namespace ?? (id === 'agentLanguage' ? 'agent-behavior' : 'tui');
+    const paths = entry?.inline === undefined ? id === 'agentLanguage' ? [['language']] : preferencePaths(id) : [[...entry.inline.path]];
+    if (paths === undefined || !ctx.settings.writable)
+        throw new Error('This setting cannot be restored in this profile.');
+    const section = ctx.settings.describe({ redactSecrets: true }).find(section => section.ns === ns);
+    if (section === undefined || entry?.inline !== undefined && section.revision !== entry.inline.revision)
+        throw new Error('Configuration changed. Refresh and retry.');
+    const revision = section.revision;
+    const fields = configFields(new z(section.schema));
+    const status = resolveStatusBarConfig(configValue(section.base, ['statusBar']), configValue(section.base, ['statusPreset']));
+    const inherited = id === 'statusReset' ? `Context: ${status.contextStyle}\nTelemetry: ${status.groups.length} items\nHeader: ${status.meta.length} items` : paths.map(path => {
+        let value = configValue(section.base, path);
+        if (path[0] === 'statusBar')
+            value = configValue(status, path.slice(1));
+        const field = fields.find(field => field.path.join('.') === path.join('.'));
+        if (value === undefined)
+            value = field?.schema.meta.default;
+        return `${path[0] === 'statusBar' && path.length === 1 ? 'Layout' : label}: ${display(value)}`;
+    }).join('\n');
+    const choice = await ctx.tui.prompt({ title: 'Restore inherited setting', question: id.startsWith('statusItem:') ? `${label} color` : label,
+        detail: `${inherited}\nOnly these Profile overrides will be removed.`, options: [{ label: 'Restore inherited value', value: 'restore' }], allowCustom: false, notify: false, signal });
+    if (choice !== 'restore' || signal.aborted)
+        return;
+    if (entry?.inline !== undefined) {
+        const field = configFields(new z(section.schema)).find(field => field.path.join('.') === entry.inline.path.join('.'));
+        if (field === undefined || field.secret || field.protected)
+            throw new Error('This setting is no longer editable.');
+        validateModelSelection(section, field, configValue(section.base, field.path));
+    }
+    await ctx.settings.mutate(ns, paths.map(path => ({ op: 'unset', path })), revision);
+    ctx.tui.notice('Inherited setting restored.');
 }
-export async function editPluginSettings(ctx, ns, signal) {
+export async function editPluginSettings(ctx, ns, signal, allowedFields, presentation, resetOnly = false) {
+    let focusedPath;
+    const directField = presentation !== undefined && allowedFields?.length === 1 && ['subagent-codex', 'subagent-claude-code'].includes(ns);
     while (!signal.aborted) {
         // Re-read after every write; never carry a stale editor into another field.
-        const section = ctx.settings.describe({ redactSecrets: true }).find(item => item.ns === ns);
-        if (section === undefined) {
-            ctx.tui.notice(`No editable configuration for ${ns}.`, { level: 'error' });
+        const descriptor = ctx.settings.describe({ redactSecrets: true }).find(item => item.ns === ns);
+        if (descriptor === undefined) {
+            await showSettingsError(ctx.tui, `No editable configuration for ${ns}.`, signal);
             return;
         }
-        const fields = configFields(new z(section.schema));
-        const selected = await ctx.tui.prompt({ ...list, title: String(section.ns), question: 'Choose a field',
-            options: fields.map((field, index) => ({ label: field.path.join('.'), value: String(index),
-                description: fieldDescription(section, field, fields) })), signal });
+        const section = { ...descriptor };
+        const fields = configFields(new z(section.schema)).filter(field => allowedFields === undefined || allowedFields.includes(field.path.join('.')));
+        const currentIndex = fields.findIndex(field => field.path.join('.') === focusedPath);
+        let selected = directField && !resetOnly ? '0' : await ctx.tui.prompt({ ...list, ...(currentIndex < 0 ? {} : { initialValue: String(currentIndex) }), title: presentation?.label ?? String(section.ns), question: resetOnly ? 'Choose a setting to restore' : 'Choose a setting',
+            options: fields.map((field, index) => ({ label: presentation?.fields[field.path.join('.')] ?? field.path.join('.'), value: String(index),
+                description: fieldDescription(section, field, fields, presentation !== undefined) })).concat(presentation !== undefined && !resetOnly ? [{ label: 'Restore inherited setting…', value: 'restore', description: 'Remove a selected Profile override.' }] : []), signal });
         if (selected === null)
             break;
+        const restore = resetOnly || selected === 'restore';
+        if (selected === 'restore')
+            selected = await ctx.tui.prompt({ ...list, title: presentation?.label ?? ns, question: 'Choose a setting to restore',
+                options: fields.map((field, index) => ({ label: presentation?.fields[field.path.join('.')] ?? field.path.join('.'), value: String(index), description: fieldDescription(section, field, fields, presentation !== undefined) })), signal });
+        if (selected === null || signal.aborted)
+            continue;
         const field = fields[Number(selected)];
         if (field === undefined || field.protected)
             continue;
+        focusedPath = field.path.join('.');
         if (!ctx.settings.writable) {
-            ctx.tui.notice('This profile is read-only.');
+            await showSettingsError(ctx.tui, 'This profile is read-only.', signal);
             continue;
         }
-        const action = await ctx.tui.prompt({ title: field.path.join('.'), question: 'Set a value or restore inheritance',
-            detail: field.secret ? 'Secret values are never shown. Reset removes the profile value and its paired credential reference; inherited credentials may still apply.' : `Current: ${display(configValue(section.value, field.path))}\nInherited: ${display(configValue(section.base, field.path))}`,
-            options: [{ label: 'Set value', value: 'set' }, { label: 'Reset to inherited', value: 'reset' }], allowCustom: false, signal });
+        const label = presentation?.fields[field.path.join('.')] ?? field.path.join('.');
+        const action = presentation !== undefined && !restore ? 'set' : await ctx.tui.prompt({ title: label, question: restore ? 'Restore inherited value?' : 'Set a value or restore inheritance',
+            detail: field.secret ? 'Secret values are never shown. Reset removes the profile value and its paired credential reference; inherited credentials may still apply.' : `Current: ${presentation === undefined ? display(configValue(section.value, field.path)) : fieldDisplay(field, configValue(section.value, field.path))}\nInherited: ${presentation === undefined ? display(configValue(section.base, field.path)) : fieldDisplay(field, configValue(section.base, field.path))}`,
+            options: [...(restore ? [] : [{ label: 'Set value', value: 'set' }]), { label: 'Reset to inherited', value: 'reset' }], allowCustom: false, notify: false, signal });
         if (action === null || signal.aborted)
             continue;
         try {
@@ -101,31 +344,86 @@ export async function editPluginSettings(ctx, ns, signal) {
                 const refPath = credentialPath(field, fields);
                 await ctx.settings.mutate(ns, [{ op: 'unset', path: field.path }, ...(refPath === undefined ? [] : [{ op: 'unset', path: refPath }])], section.revision);
             }
+            else if (section.ns === 'subagent-model-selection-settings' && field.path.join('.') === 'allowedModels') {
+                const routes = await chooseSubagentModels(ctx, configValue(section.value, field.path), signal);
+                if (routes === null)
+                    continue;
+                field.schema(routes);
+                await saveValue(ctx, section, field, routes);
+            }
             else {
-                const constants = field.schema.type === 'boolean' ? [true, false] : field.schema.type === 'union'
-                    && field.schema.list?.every(child => child.type === 'const') ? field.schema.list.map(child => child.value) : undefined;
-                const text = await ctx.tui.prompt({ title: field.path.join('.'), question: field.schema.type === 'string' ? 'Enter a value' : 'Enter a JSON value',
-                    ...(field.secret ? {} : { detail: field.schema.toString() }), secret: field.secret,
-                    ...(constants === undefined ? { allowCustom: true } : { allowCustom: false, options: constants.map(value => ({ label: display(value), value: JSON.stringify(value) })) }), signal });
-                if (text === null || signal.aborted)
+                const constants = constantValues(field);
+                const current = configValue(section.value, field.path);
+                const unitHelp = field.schema.type !== 'number' ? '' : (field.path.at(-1) ?? '').endsWith('Ms') ? 'Use milliseconds, or units such as 30s and 2m.'
+                    : (field.path.at(-1) ?? '').endsWith('Bytes') ? 'Use bytes, or units such as 512 KiB and 2 MiB.' : '';
+                const text = await ctx.tui.prompt({ title: label, question: field.schema.type === 'string' || presentation !== undefined && field.schema.type === 'number' ? 'Enter a value' : constants === undefined ? 'Enter a JSON value' : 'Choose a value',
+                    ...(field.secret ? {} : { detail: presentation === undefined ? field.schema.toString() : [`Current: ${fieldDisplay(field, current)}`, field.schema.meta.description, unitHelp].filter(Boolean).join('\n') }), secret: field.secret,
+                    ...(field.secret ? {} : constants === undefined ? { initialInput: current === undefined ? '' : presentation !== undefined && field.schema.type === 'number' ? fieldDisplay(field, current) : field.schema.type === 'string' ? String(current) : JSON.stringify(current) }
+                        : { initialValue: JSON.stringify(current) }),
+                    ...(constants === undefined ? { allowCustom: true } : { allowCustom: false, options: constants.map(value => ({ label: presentation !== undefined && typeof value === 'boolean' ? value ? 'On' : 'Off' : display(value), value: JSON.stringify(value) })) }), notify: false, signal });
+                if (text === null || signal.aborted) {
+                    if (directField)
+                        return;
                     continue;
-                const value = parseConfigValue(field, text);
+                }
+                const value = presentation === undefined ? parseConfigValue(field, text) : parseProductValue(field, text);
                 await saveValue(ctx, section, field, value);
             }
-            ctx.tui.notice(`${ns}.${field.path.join('.')}: ${action === 'reset' ? 'inherited value restored' : 'saved'}.`);
+            ctx.tui.notice(`${presentation === undefined ? `${ns}.${field.path.join('.')}` : label}: ${action === 'reset' ? 'inherited value restored' : 'saved'}.`);
+            if (directField && !resetOnly)
+                return;
         }
         catch (error) {
             // Secret validation messages may echo their input.
-            ctx.tui.notice(field.secret ? 'Could not save the secret. Refresh the field and check its format or credential storage.' : error instanceof Error ? error.message : String(error), { level: 'error' });
+            await showSettingsError(ctx.tui, field.secret ? 'Could not save the secret. Refresh the field and check its format or credential storage.' : error instanceof Error ? error.message : String(error), signal);
         }
     }
 }
+async function chooseSubagentModels(ctx, current, signal) {
+    const routes = [];
+    const key = (route) => JSON.stringify([route.provider, route.model]);
+    const existing = Array.isArray(current) ? current.filter((route) => route !== null && typeof route === 'object' && typeof route.provider === 'string' && typeof route.model === 'string') : [];
+    const llm = ctx.get('llm');
+    const unavailable = [];
+    if (llm !== undefined) {
+        const providers = llm.listProviders();
+        const catalogs = await Promise.allSettled(providers.map(provider => llm.listModels(provider.id)));
+        signal.throwIfAborted();
+        catalogs.forEach((catalog, index) => {
+            const provider = providers[index];
+            if (catalog.status === 'rejected') {
+                unavailable.push(provider.id);
+                return;
+            }
+            for (const model of catalog.value)
+                routes.push({ provider: provider.id, model: model.id, label: `${model.name ?? model.id} · ${provider.id}`, description: model.description ?? model.id });
+        });
+    }
+    for (const route of existing)
+        if (!routes.some(item => key(item) === key(route)))
+            routes.push({ ...route, label: `${route.model} · ${route.provider}`, description: 'Configured route · currently outside the model catalog' });
+    const unique = routes.filter((route, index) => routes.findIndex(item => key(item) === key(route)) === index);
+    const answer = await ctx.tui.prompt({ ...list, title: 'Allowed subagent models', question: 'Choose models for new sessions', detail: `Space toggles a model. Enter saves the selection. Existing sessions keep their routes.${unavailable.length === 0 ? '' : ` Catalog unavailable: ${unavailable.join(', ')}; configured routes are retained.`}`,
+        emptyText: 'No models are available. Configure a provider through /login or cancel to keep the current setting.',
+        multiSelect: true, allowEmptySelection: true, initialValues: unique.flatMap((route, index) => existing.some(item => key(item) === key(route)) ? [String(index)] : []),
+        options: unique.map((route, index) => ({ label: route.label, ...(route.description === undefined ? {} : { description: route.description }), value: String(index) })), signal, notify: false });
+    if (answer === null)
+        return null;
+    if (answer === '')
+        return [];
+    return answer.split(', ').map(value => {
+        const route = unique[Number(value)];
+        if (route === undefined || !/^\d+$/u.test(value))
+            throw new Error('Model selection changed. Refresh and retry.');
+        return { provider: route.provider, model: route.model };
+    });
+}
 function validateModelSelection(section, field, value) {
     if (section.ns === 'subagent-model-selection-settings') {
         const enabled = field.path[0] === 'enabled' ? value : configValue(section.value, ['enabled']);
         const models = field.path[0] === 'allowedModels' ? value : configValue(section.value, ['allowedModels']);
         if (enabled === true && (!Array.isArray(models) || models.length === 0))
-            throw new Error('Set at least one allowedModels route before enabling subagent model selection.');
+            throw new Error('Choose at least one allowed model before enabling subagent model selection.');
     }
 }
 async function saveValue(ctx, section, field, value) {