@agi-fans/oh-my-dsh 0.14.0 → 0.16.0

package/config/agent-presets/code/agent.cordis.yml

@@ -1,5 +1,5 @@
 - id: persona
   name: '@deepseek-ai/dsh-persona'
   config:
-    text: >-
+    prefix: >-
       You are a coding agent powered by the {{model}} model. Your working directory is {{cwd}}. Prefer programmatic tool calling for multi-step operations when the generated tools SDK is available.

package/config/agent-presets/cordis/agent.cordis.yml

@@ -1,7 +1,7 @@
 - id: persona
   name: '@deepseek-ai/dsh-persona'
   config:
-    text: |-
+    prefix: |-
       You are a coding agent powered by the {{model}} model, running on the DeepSeek Harness. Your working directory is {{cwd}}.
 
       You can inspect and experiment with the live Cordis runtime. Host composition owns shared registries and backends; an Agent preset owns one session's tools, persona, prompt sections, and isolated services. Treat runtime mutation as shell-level authority and explain the affected composition boundary before changing it.

package/config/agent-presets/minimal/agent.cordis.yml

@@ -1,16 +1,19 @@
 - id: persona
   name: '@deepseek-ai/dsh-persona'
   config:
-    text: You are a helpful software engineer assistant.{{omdsh_agent_behavior}}
+    prefix: You are a helpful software engineer assistant.{{omdsh_agent_behavior}}
     complete: true
     includeRuntimeContext: false
 
+# `shell` is an omdsh alias for the host's one shell tool (`bash` on POSIX,
+# `pwsh` on Windows), so this two-tool shape holds on every platform without a
+# name that `tools.restrict()` would reject.
 - id: profile
   name: '@agi-fans/dsh-tui/agent-profile'
   config:
     tools:
       allow:
-        - bash
+        - shell
         - str_replace_editor
 
 - id: persistent-shell
@@ -24,10 +27,26 @@
 
     - id: terminal-bash
       name: '@deepseek-ai/dsh-terminal-bash'
+      disabled: !!js process.platform === 'win32'
       config:
         timeoutMs: 300000
 
     - id: persistent-bash
       name: '@deepseek-ai/dsh-tool-bash-persistent'
+      disabled: !!js process.platform === 'win32'
+      config:
+        timeoutMs: 300000
+
+    # The PTY backend is shared; the dialect selects PowerShell on Windows.
+    - id: terminal-pwsh
+      name: '@deepseek-ai/dsh-terminal-bash'
+      disabled: !!js process.platform !== 'win32'
+      config:
+        shellDialect: pwsh
+        timeoutMs: 300000
+
+    - id: persistent-pwsh
+      name: '@deepseek-ai/dsh-tool-pwsh-persistent'
+      disabled: !!js process.platform !== 'win32'
       config:
         timeoutMs: 300000

package/config/agent-presets/standard/agent.cordis.yml

@@ -1,5 +1,5 @@
 - id: persona
   name: '@deepseek-ai/dsh-persona'
   config:
-    text: >-
+    prefix: >-
       You are a coding agent powered by the {{model}} model. Your working directory is {{cwd}}.

package/config/cordis.yml

@@ -44,13 +44,14 @@
   - id: session-stats
     name: '@deepseek-ai/dsh-session-stats'
 
-  # Exact session reads for @session mentions. openAt: never keeps FTS closed so
-  # Node 22 never loads experimental node:sqlite; list/read still work over JSONL.
+  # Exact session reads for @session mentions, plus lazy full-text search.
+  # openAt: first-search keeps startup free of experimental node:sqlite; the
+  # index opens only when a human actually searches the session library.
   - id: session-query
     name: '@deepseek-ai/dsh-session-query-sqlite'
     config:
       path: ':memory:'
-      openAt: never
+      openAt: first-search
 
   - id: session-reference
     name: '@deepseek-ai/dsh-session-reference'
@@ -100,7 +101,7 @@
     name: '@deepseek-ai/dsh-agent-default-model'
     config:
       provider: !!js process.env.OMDSH_PROVIDER || 'deepseek-official'
-      model: !!js process.env.OMDSH_MODEL || 'deepseek-v4-flash'
+      model: !!js process.env.OMDSH_MODEL || 'deepseek-flash'
 
   - id: agent-presets
     name: '@deepseek-ai/dsh-agent-presets'
@@ -134,7 +135,7 @@
       workspaceRoot: !!js process.cwd()
 
   - id: fs
-    name: '@deepseek-ai/dsh-fs-local'
+    name: '@deepseek-ai/dsh-fs-sandbox'
 
   - id: fs-observation-policy
     name: '@deepseek-ai/dsh-fs-observation-policy'
@@ -142,8 +143,23 @@
   - id: subprocess
     name: '@deepseek-ai/dsh-subprocess-local'
 
+  # Exactly one shell stack mounts per host: the bash stack gates off Windows
+  # and its PowerShell twin gates off everything else, so a session always has
+  # one confined shell and never a tool whose interpreter is missing. Timeouts
+  # are pinned rather than inherited: upstream's 60s base default is short for
+  # ordinary builds and test suites, and the model can still raise the limit
+  # per call or run the command in the background.
   - id: bash
     name: '@deepseek-ai/dsh-bash-sandbox'
+    disabled: !!js process.platform === 'win32'
+    config:
+      timeoutMs: 120000
+
+  - id: pwsh
+    name: '@deepseek-ai/dsh-pwsh-sandbox'
+    disabled: !!js process.platform !== 'win32'
+    config:
+      timeoutMs: 120000
 
   - id: permission
     name: '@deepseek-ai/dsh-permission-presets'
@@ -221,6 +237,11 @@
 
   - id: tool-bash
     name: '@deepseek-ai/dsh-tool-bash'
+    disabled: !!js process.platform === 'win32'
+
+  - id: tool-pwsh
+    name: '@deepseek-ai/dsh-tool-pwsh'
+    disabled: !!js process.platform !== 'win32'
 
   - id: agent-instructions
     name: '@deepseek-ai/dsh-agent-instructions'
@@ -233,6 +254,18 @@
   - id: tool-jobs
     name: '@deepseek-ai/dsh-tool-jobs'
 
+  # Persistent, owner-scoped terminal sessions for interactive stdin and
+  # cross-call state (REPLs, debuggers, a shell to return to). The one-shot
+  # bash/pwsh tools remain the default for bounded commands.
+  - id: terminal
+    name: '@deepseek-ai/dsh-terminal'
+
+  - id: terminal-bash
+    name: '@deepseek-ai/dsh-terminal-bash'
+
+  - id: tool-terminal
+    name: '@deepseek-ai/dsh-tool-terminal'
+
   - id: agent-loop
     name: '@deepseek-ai/dsh-agent-loop'
     config:
@@ -286,15 +319,72 @@
     config:
       maxOutputChars: 16000
 
+  # Deliverables: the model declares the workspace files it finished so the
+  # user can find them afterwards. The files are not copied or preserved — the
+  # card lists their source paths, and the TUI renders that list instead of the
+  # raw call arguments.
+  - id: tool-present
+    name: '@deepseek-ai/dsh-tool-present'
+
+  # Anonymous public web fetch, no credential and no search provider: a fetch
+  # costs nothing and the TUI already renders web sources. Search stays off
+  # because DeepSeek's native search spends a whole model turn per query; a
+  # deployment that wants it mounts a provider in its own overlay and flips
+  # `search` on here.
+  - id: web
+    name: '@deepseek-ai/dsh-web'
+
+  - id: web-fetch-http
+    name: '@deepseek-ai/dsh-web-fetch-http'
+
+  - id: tool-web
+    name: '@deepseek-ai/dsh-tool-web'
+    config:
+      search: false
+      fetch: true
+
+  # Spills one oversized plain-text tool result to a private file and hands the
+  # model a bounded preview plus the path. The cap is deliberately far above
+  # upstream's 50 KB: the session log carries the replacement, so a lower cap
+  # would shorten what a human can expand in the transcript.
+  - id: spill-local
+    name: '@deepseek-ai/dsh-spill-local'
+
+  - id: spill-policy
+    name: '@deepseek-ai/dsh-spill-policy'
+    config:
+      maxInlineBytes: 200000
+
   - id: token-meter
     name: '@deepseek-ai/dsh-token-meter'
 
+  # Trims oversized tool results before condensation, so the model-visible
+  # result stays inside the budget; the full original stays in the session log.
+  # compaction-basic reads this through ctx.get, so the row must precede it.
+  - id: tool-result-pruner
+    name: '@deepseek-ai/dsh-compaction-tool-result-pruner'
+    config:
+      thresholdChars: 8192
+      headChars: 4096
+      tailChars: 1024
+
   - id: compaction
     name: '@deepseek-ai/dsh-compaction-basic'
 
   - id: command-compact
     name: '@deepseek-ai/dsh-command-compact'
 
+  # Guard rails on the tool chain: a cooperative per-tool deadline, and an
+  # advisory reminder when an agent repeats an identical call.
+  - id: timeout-policy
+    name: '@deepseek-ai/dsh-tool-call-timeout-policy'
+
+  - id: repeat-tool-reminder
+    name: '@deepseek-ai/dsh-repeat-tool-reminder'
+    config:
+      thresholds: [3, 5, 8]
+      argumentsPreviewChars: 500
+
   - id: subagent
     name: '@deepseek-ai/dsh-subagent'
 
@@ -303,6 +393,43 @@
     config:
       providerName: spawn
 
+  # Fork seeds the child with the parent's completed turns, so the inherited
+  # prefix stays eligible for KV cache reuse. Model selection is deliberately
+  # absent: a child that switched routes would pay for the inherited history
+  # again.
+  - id: subagent-fork
+    name: '@deepseek-ai/dsh-subagent-fork-in-process'
+    config:
+      providerName: fork
+
+  # Process-isolated transport. Every in-process backend above runs the child
+  # agent on the TUI's own event loop, so a heavy delegation starves rendering
+  # and the activity animation. This backend spawns a whole child runtime
+  # instead, moving that CPU off the TUI thread. It is an extra opt-in
+  # transport: `spawn`/`fork` stay mounted and keep their parent-shared
+  # features, which ACP cannot honour.
+  #
+  # ACP advertises no start-time capabilities and implements no continuable
+  # runs, so `providerName: acp` must not be selected by a tool that needs
+  # `agentOptions`, `persona`, `toolFilter`, a numeric `maxDepth`, or
+  # `backgroundMode: continuable`.
+  - id: subagent-acp
+    name: '@deepseek-ai/dsh-subagent-acp'
+    config:
+      providerName: acp
+      command: !!js process.env.OMDSH_ACP_COMMAND || 'dsh'
+      args: !!js (process.env.OMDSH_ACP_ARGS || '--profile acp').split(' ')
+      permission: allow
+      # The child boots its own profile, so it gets its own home. Leaving the
+      # parent's home visible would let the child read the parent's profiles
+      # and credentials, and a composition that also delegated by ACP would
+      # recurse.
+      env:
+        DSH_HOME: !!js (process.env.OMDSH_HOME || process.env.DSH_HOME || process.env.HOME + '/.dsh') + '/acp-child'
+        OMDSH_HOME: !!js process.env.OMDSH_HOME || process.env.DSH_HOME || undefined
+        OMDSH_DEEPSEEK_API_KEY: !!js process.env.OMDSH_DEEPSEEK_API_KEY || undefined
+        DEEPSEEK_API_KEY: !!js process.env.DEEPSEEK_API_KEY || process.env.OMDSH_DEEPSEEK_API_KEY || undefined
+
   - id: subagent-control
     name: '@deepseek-ai/dsh-tool-subagent-control'
 
@@ -316,10 +443,68 @@
       toolName: subagent
       backgroundMode: continuable
 
+  - id: tool-subagent-fork
+    name: '@deepseek-ai/dsh-tool-subagent'
+    config:
+      provider: fork
+      toolName: subagent_fork
+      backgroundMode: continuable
+
+  # The isolated delegation tool. It is a second `dsh-tool-subagent` over the
+  # out-of-process backend, so a caller chooses isolation per delegation
+  # instead of trading the parent-shared features away globally.
+  #
+  # Three settings are forced by ACP's absent capabilities, not preferences:
+  #   - `maxDepth: provider-managed` — a numeric cap is refused because the
+  #     provider cannot enforce recursion depth across a process boundary, and
+  #     the child's own composition already bounds it.
+  #   - `backgroundMode: one-shot` — the published ACP provider implements no
+  #     `prepareContinuable`, so a continuable run is refused at mount.
+  #   - no `agentOptions`/`persona`/`toolFilter` — all three are refused.
+  # The consequence is user-visible: an isolated child cannot be steered or
+  # followed up after dispatch. Use `subagent` when that matters.
+  - id: tool-subagent-isolated
+    name: '@deepseek-ai/dsh-tool-subagent'
+    config:
+      provider: acp
+      toolName: subagent_isolated
+      backgroundMode: one-shot
+      maxDepth: provider-managed
+
+  # Workflow and Ralph, as the upstream base bundle mounts them.
+  #
+  # The worker-thread engine is the seam provider: `dsh-workflow-worker-thread`
+  # executes model-written orchestration scripts off the host event loop, which
+  # is the same isolation the ACP subagent transport buys for delegation.
+  # Mounting `dsh-workflow` as well would double-register `workflowEngine`, so
+  # it stays a dependency the engine resolves rather than a composition row.
+  - id: workflow-worker-thread
+    name: '@deepseek-ai/dsh-workflow-worker-thread'
+    config:
+      provider: spawn
+
+  # `toolName` is renamed because omdsh already owns a `/workflow` slash command
+  # that switches the Default/Plan workflow. The two live in different
+  # namespaces (tool vs command) and never collide at runtime, but a bare
+  # `workflow` entry in `/tools` would read as that command.
+  - id: tool-workflow
+    name: '@deepseek-ai/dsh-tool-workflow'
+    config:
+      toolName: workflow_run
+
+  # Ralph iterates fresh agents over a build-time-fixed script; it reuses the
+  # continuable in-process `spawn` provider, so it depends on that transport
+  # staying mounted.
+  - id: tool-ralph
+    name: '@deepseek-ai/dsh-tool-ralph'
+    config:
+      subagentProvider: spawn
+      maxRounds: 64
+
   - id: tui
     name: '@agi-fans/dsh-tui'
     config:
-      model: !!js process.env.OMDSH_MODEL || 'deepseek-v4-flash'
+      model: !!js process.env.OMDSH_MODEL || 'deepseek-flash'
 
   - id: agent-behavior
     name: '@agi-fans/oh-my-dsh/agent-behavior'
@@ -354,12 +539,18 @@
   - id: tui-command-export
     name: '@agi-fans/dsh-tui/command-export'
 
+  - id: tui-command-diff
+    name: '@agi-fans/dsh-tui/command-diff'
+
   - id: tui-command-trajectory
     name: '@agi-fans/dsh-tui/command-trajectory'
 
   - id: tui-command-integrations
     name: '@agi-fans/dsh-tui/command-integrations'
 
+  - id: tui-command-jobs
+    name: '@agi-fans/dsh-tui/command-jobs'
+
   - id: tui-startup-notices
     name: '@agi-fans/dsh-tui/startup-notices'
 

package/lib/args.js

@@ -26,7 +26,7 @@ Usage:
   omdsh completions bash|zsh|fish
 
 Options:
-  --model <name>      model route (default deepseek-v4-flash)
+  --model <name>      model route (default deepseek-flash)
   --provider <name>   provider route (default deepseek-official)
   -r, --resume <id>   resume a durable session
   --dump-config       print the composed plugin tree and exit

package/lib/boot.js

@@ -9,7 +9,7 @@ import { provideCmdline } from '@deepseek-ai/dsh-cmdline';
 import { DSH_LAUNCH_ENVIRONMENT_KEY } from '@deepseek-ai/dsh-launch-environment';
 import { NAME, prepareLaunchEnvironment } from "./composition.js";
 import { composeLaunch, INSTALL_ANCHOR } from "./profile.js";
-import { omdshHome } from "./mcp-config.js";
+import { omdshHome } from "./config-paths.js";
 import { createProcessShutdown } from "./process-shutdown.js";
 export { NAME } from "./composition.js";
 /**
@@ -21,9 +21,7 @@ export { NAME } from "./composition.js";
 export async function runOmdsh(prompt, resume) {
     const app = {};
     const shutdown = createProcessShutdown(async () => { await app.current?.fiber.dispose(); });
-    const signalShutdown = new AbortController();
     const interrupt = (code) => {
-        signalShutdown.abort();
         shutdown.interrupt(code);
     };
     // SIGINT only fires outside raw mode (a raw tty delivers Ctrl-C as a

package/lib/config-paths.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Shared discovery paths for omdsh's native configuration adapters: the user
+ * directory (`$OMDSH_HOME` / `$DSH_HOME`, else `~/.dsh`) and the project root a
+ * `.dsh/` directory belongs to.
+ * @module @agi-fans/oh-my-dsh
+ */
+/** Resolve the native user-level configuration directory. */
+export declare function omdshHome(environment?: NodeJS.ProcessEnv): string;
+/** Nearest ancestor holding `.git`, else the resolved cwd. */
+export declare function projectRoot(cwd: string): string;

package/lib/config-paths.js

@@ -0,0 +1,30 @@
+/**
+ * Shared discovery paths for omdsh's native configuration adapters: the user
+ * directory (`$OMDSH_HOME` / `$DSH_HOME`, else `~/.dsh`) and the project root a
+ * `.dsh/` directory belongs to.
+ * @module @agi-fans/oh-my-dsh
+ */
+import { existsSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { dirname, isAbsolute, join, resolve } from 'node:path';
+/** Resolve the native user-level configuration directory. */
+export function omdshHome(environment = process.env) {
+    const configured = environment.OMDSH_HOME?.trim() || environment.DSH_HOME?.trim();
+    return configured === undefined
+        ? join(homedir(), '.dsh')
+        : (isAbsolute(configured) ? configured : resolve(configured));
+}
+/** Nearest ancestor holding `.git`, else the resolved cwd. */
+export function projectRoot(cwd) {
+    const fallback = resolve(cwd);
+    let current = fallback;
+    for (;;) {
+        if (existsSync(join(current, '.git')))
+            return current;
+        const parent = dirname(current);
+        if (parent === current)
+            return fallback;
+        current = parent;
+    }
+}
+//# sourceMappingURL=config-paths.js.map

package/lib/lsp-config.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Native omdsh language-server configuration adapter.
+ *
+ * This module owns only deployment discovery: it translates a `servers` JSON
+ * shape into the three Harness rows a language server needs — the `dsh-lsp`
+ * seam, the `dsh-lsp-stdio` host, and the model-facing `dsh-tool-lsp` tool.
+ * Server process lifecycle, protocol framing, and result normalization remain
+ * owned by the Harness packages. Nothing is mounted when no server is
+ * configured, so a composition without language servers never advertises an
+ * `lsp` tool that can only fail.
+ * @module @agi-fans/oh-my-dsh
+ */
+export interface LspPluginRow {
+    id: string;
+    name: string;
+    config?: Record<string, unknown>;
+}
+export interface LspInsertPatch {
+    insert: LspPluginRow[];
+}
+/**
+ * Load user and project language-server definitions and turn them into Loader
+ * insert patches. Project definitions override same-named user definitions.
+ * All three rows are emitted together or not at all: the seam and tool without
+ * a provider would advertise an `lsp` tool whose every call fails.
+ */
+export declare function loadLspPatches(cwd?: string, environment?: NodeJS.ProcessEnv): LspInsertPatch[];

package/lib/lsp-config.js

@@ -0,0 +1,147 @@
+/**
+ * Native omdsh language-server configuration adapter.
+ *
+ * This module owns only deployment discovery: it translates a `servers` JSON
+ * shape into the three Harness rows a language server needs — the `dsh-lsp`
+ * seam, the `dsh-lsp-stdio` host, and the model-facing `dsh-tool-lsp` tool.
+ * Server process lifecycle, protocol framing, and result normalization remain
+ * owned by the Harness packages. Nothing is mounted when no server is
+ * configured, so a composition without language servers never advertises an
+ * `lsp` tool that can only fail.
+ * @module @agi-fans/oh-my-dsh
+ */
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { omdshHome, projectRoot } from "./config-paths.js";
+function configError(path, detail) {
+    return new Error(`omdsh: invalid LSP config ${path}: ${detail}`);
+}
+function object(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function readDocument(path) {
+    if (!existsSync(path))
+        return undefined;
+    let parsed;
+    try {
+        parsed = JSON.parse(readFileSync(path, 'utf8'));
+    }
+    catch (error) {
+        throw configError(path, error instanceof Error ? error.message : String(error));
+    }
+    if (!object(parsed) || !object(parsed.servers)) {
+        throw configError(path, 'expected an object with a "servers" object');
+    }
+    return { servers: parsed.servers };
+}
+function stringArray(value, path, field) {
+    if (value === undefined)
+        return undefined;
+    if (!Array.isArray(value) || value.some(item => typeof item !== 'string')) {
+        throw configError(path, `"${field}" must be an array of strings`);
+    }
+    return value;
+}
+function stringRecord(value, path, field) {
+    if (value === undefined)
+        return undefined;
+    if (!object(value) || Object.values(value).some(item => typeof item !== 'string')) {
+        throw configError(path, `"${field}" must be an object of string values`);
+    }
+    return value;
+}
+function optionalBoolean(value, path, field) {
+    if (value === undefined)
+        return undefined;
+    if (typeof value !== 'boolean')
+        throw configError(path, `"${field}" must be a boolean`);
+    return value;
+}
+/** Lowercase leading-dot extension → LSP language id, as the stdio host requires. */
+function extensionToLanguage(value, path, field) {
+    if (!object(value))
+        throw configError(path, `"${field}" must be an object of extension-to-language entries`);
+    const entries = Object.entries(value);
+    if (entries.length === 0)
+        throw configError(path, `"${field}" must map at least one extension`);
+    for (const [extension, language] of entries) {
+        if (!/^\.[a-z0-9]+$/u.test(extension)) {
+            throw configError(path, `"${field}.${extension}" must be a lowercase leading-dot extension`);
+        }
+        if (typeof language !== 'string' || language === '') {
+            throw configError(path, `"${field}.${extension}" must name a non-empty language id`);
+        }
+    }
+    return value;
+}
+function expandEnvironment(value, environment) {
+    if (typeof value === 'string') {
+        return value.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)(?::-([^}]*))?\}/gu, (token, name, fallback) => environment[name] ?? fallback ?? token);
+    }
+    if (Array.isArray(value))
+        return value.map(item => expandEnvironment(item, environment));
+    if (!object(value))
+        return value;
+    return Object.fromEntries(Object.entries(value).map(([key, item]) => [key, expandEnvironment(item, environment)]));
+}
+function serverConfig(name, raw, path, environment) {
+    if (!/^[A-Za-z0-9_-]{1,32}$/u.test(name)) {
+        throw configError(path, `server name "${name}" must match [A-Za-z0-9_-]{1,32}`);
+    }
+    const value = expandEnvironment(raw, environment);
+    if (!object(value))
+        throw configError(path, `server "${name}" must be an object`);
+    if (optionalBoolean(value.enabled, path, `${name}.enabled`) === false)
+        return undefined;
+    const command = value.command;
+    if (typeof command !== 'string' || command === '') {
+        throw configError(path, `server "${name}" requires a non-empty "command"`);
+    }
+    const args = stringArray(value.args, path, `${name}.args`);
+    const env = stringRecord(value.env, path, `${name}.env`);
+    const languages = extensionToLanguage(value.extensionToLanguage, path, `${name}.extensionToLanguage`);
+    return {
+        command,
+        ...(args === undefined ? {} : { args }),
+        ...(env === undefined ? {} : { env }),
+        extensionToLanguage: languages,
+        ...(value.initializationOptions === undefined ? {} : { initializationOptions: value.initializationOptions }),
+        ...(value.configuration === undefined ? {} : { configuration: value.configuration }),
+    };
+}
+/**
+ * Load user and project language-server definitions and turn them into Loader
+ * insert patches. Project definitions override same-named user definitions.
+ * All three rows are emitted together or not at all: the seam and tool without
+ * a provider would advertise an `lsp` tool whose every call fails.
+ */
+export function loadLspPatches(cwd = process.cwd(), environment = process.env) {
+    const files = [
+        join(omdshHome(environment), 'lsp.json'),
+        join(projectRoot(cwd), '.dsh', 'lsp.json'),
+    ];
+    const merged = new Map();
+    for (const path of files) {
+        const document = readDocument(path);
+        if (document === undefined)
+            continue;
+        for (const [name, value] of Object.entries(document.servers))
+            merged.set(name, { value, path });
+    }
+    const servers = {};
+    for (const [name, source] of merged) {
+        const config = serverConfig(name, source.value, source.path, environment);
+        if (config !== undefined)
+            servers[name] = config;
+    }
+    if (Object.keys(servers).length === 0)
+        return [];
+    return [{
+            insert: [
+                { id: 'lsp', name: '@deepseek-ai/dsh-lsp' },
+                { id: 'lsp-stdio', name: '@deepseek-ai/dsh-lsp-stdio', config: { servers } },
+                { id: 'tool-lsp', name: '@deepseek-ai/dsh-tool-lsp' },
+            ],
+        }];
+}
+//# sourceMappingURL=lsp-config.js.map

package/lib/mcp-config.d.ts

@@ -15,8 +15,6 @@ export interface McpPluginRow {
 export interface McpInsertPatch {
     insert: McpPluginRow[];
 }
-/** Resolve the native user-level MCP document. */
-export declare function omdshHome(environment?: NodeJS.ProcessEnv): string;
 /**
  * Load user and project MCP definitions and turn them into Loader insert
  * patches. Project definitions override same-named user definitions.

package/lib/mcp-config.js

@@ -8,8 +8,8 @@
  * @module @agi-fans/oh-my-dsh
  */
 import { existsSync, readFileSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { dirname, isAbsolute, join, resolve } from 'node:path';
+import { join } from 'node:path';
+import { omdshHome, projectRoot } from "./config-paths.js";
 function configError(path, detail) {
     return new Error(`omdsh: invalid MCP config ${path}: ${detail}`);
 }
@@ -129,25 +129,6 @@ function serverConfig(name, raw, path, environment) {
 function safeId(name) {
     return 'mcp-' + name;
 }
-/** Resolve the native user-level MCP document. */
-export function omdshHome(environment = process.env) {
-    const configured = environment.OMDSH_HOME?.trim() || environment.DSH_HOME?.trim();
-    return configured === undefined
-        ? join(homedir(), '.dsh')
-        : (isAbsolute(configured) ? configured : resolve(configured));
-}
-function projectRoot(cwd) {
-    const fallback = resolve(cwd);
-    let current = fallback;
-    for (;;) {
-        if (existsSync(join(current, '.git')))
-            return current;
-        const parent = dirname(current);
-        if (parent === current)
-            return fallback;
-        current = parent;
-    }
-}
 /**
  * Load user and project MCP definitions and turn them into Loader insert
  * patches. Project definitions override same-named user definitions.

package/lib/plugin.js

@@ -13,7 +13,7 @@ import { createRequire } from 'node:module';
 import { existsSync, readFileSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
 import { readProfileManifest, resolveBundleDir, resolveProfileDir, writeProfileManifest, } from '@deepseek-ai/dsh-app-boot';
-import { omdshHome } from "./mcp-config.js";
+import { omdshHome } from "./config-paths.js";
 import { ensureOmdshProfile, INSTALL_ANCHOR, NAME, PRODUCT_BUNDLE, PROFILE_NAME, } from "./profile.js";
 export const PLUGIN_USAGE = `
 omdsh plugin — install DSH bundles into the omdsh Profile

package/lib/profile.d.ts

@@ -47,7 +47,7 @@ export interface LaunchComposition {
 export declare function agentPresetsOverlay(layerPatches: readonly PatchOptions[][]): PatchOptions | undefined;
 /**
  * Compose the live launch layers in product → user bundles → Profile patch
- * → home patch → MCP → agent-presets overlay order.
+ * → home patch → MCP → LSP → agent-presets overlay order.
  */
 export declare function composeLaunch(cwd?: string, environment?: NodeJS.ProcessEnv, options?: {
     userLayer?: boolean;

package/lib/profile.js

@@ -10,7 +10,9 @@ import { existsSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { composeEntries, initProfile, loadOptionalPatches, loadProfile, PROFILE_PATCH_FILENAME, readProfileManifest, resolveProfileDir, writeProfileManifest, } from '@deepseek-ai/dsh-app-boot';
-import { loadMcpPatches, omdshHome } from "./mcp-config.js";
+import { omdshHome } from "./config-paths.js";
+import { loadLspPatches } from "./lsp-config.js";
+import { loadMcpPatches } from "./mcp-config.js";
 export const NAME = 'omdsh';
 export const PROFILE_NAME = 'omdsh';
 export const PRODUCT_BUNDLE = '@agi-fans/oh-my-dsh';
@@ -84,7 +86,7 @@ export function agentPresetsOverlay(layerPatches) {
 }
 /**
  * Compose the live launch layers in product → user bundles → Profile patch
- * → home patch → MCP → agent-presets overlay order.
+ * → home patch → MCP → LSP → agent-presets overlay order.
  */
 export function composeLaunch(cwd = process.cwd(), environment = process.env, options = {}) {
     const userLayer = options.userLayer !== false;
@@ -103,6 +105,9 @@ export function composeLaunch(cwd = process.cwd(), environment = process.env, op
     const mcp = loadMcpPatches(cwd, environment);
     if (mcp.length > 0)
         layers.push({ label: 'mcp.json', patches: mcp });
+    const lsp = loadLspPatches(cwd, environment);
+    if (lsp.length > 0)
+        layers.push({ label: 'lsp.json', patches: lsp });
     const overlay = agentPresetsOverlay(layers.map(layer => layer.patches));
     if (overlay !== undefined)
         layers.push({ label: 'agent-presets', patches: [overlay] });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agi-fans/oh-my-dsh",
   "description": "omdsh: a keyboard-first DeepSeek TUI coding agent on the DeepSeek Harness runtime",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "homepage": "https://omdsh.agi.fans/",
   "keywords": [
     "omdsh",
@@ -51,83 +51,112 @@
   "dependencies": {
     "@deepseek-ai/cordis-plugin-loader": "1.0.3",
     "@deepseek-ai/cordis-plugin-timer": "1.1.4",
-    "@deepseek-ai/dsh-agent": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-agent-default-model": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-agent-instructions": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-agent-loop": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-agent-presets": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-app-boot": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-attachment-local": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-authorization": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-bash-sandbox": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-cmdline": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-code-runtime-worker-thread": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-command-compact": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-command-goal": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-commands": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-compaction-basic": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-cordis-host-runner": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-credentials-local": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-file-reference": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-file-reference-local": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-fs-local": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-fs-observation-policy": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-goal": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-goal-round-driver": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-invariants": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-jobs-local": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-launch-environment": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-llm-deepseek": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-llm-retry": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-mcp-client": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-permission-presets": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-persona": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-plan-mode": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-sandbox-local": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-sandbox-policy": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-scope": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session-checkpoint-policy": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session-persistence-jsonl": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session-projection": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session-query": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session-query-sqlite": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session-reference": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session-stats": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session-title": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-settings": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-settings-file": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-shell-env": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-skill": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-skill-filesystem": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-subagent": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-subagent-spawn-in-process": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-subprocess-local": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-system-prompt": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-terminal": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-terminal-bash": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-token-meter": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-ask-user": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-bash": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-bash-persistent": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-cordis": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-fs": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-fs-search": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-goal": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-jobs": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-skill": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-str-replace-editor": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-subagent": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-subagent-control": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tool-todo": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tools": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-user-approval": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-user-questions": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-agent": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-agent-default-model": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-agent-instructions": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-agent-loop": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-agent-presets": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-app-boot": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-attachment-local": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-authorization": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-bash-sandbox": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-cmdline": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-code-runtime-worker-thread": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-command-compact": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-command-goal": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-commands": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-compaction-basic": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-compaction-tool-result-pruner": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-cordis-host-runner": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-credentials-local": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-file-reference": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-file-reference-local": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-fs-local": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-fs-observation-policy": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-fs-sandbox": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-goal": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-goal-round-driver": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-http-proxy": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-invariants": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-jobs-local": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-launch-environment": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-llm-deepseek": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-llm-retry": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-lsp": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-lsp-stdio": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-mcp-client": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-output-retention": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-permission-presets": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-persona": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-plan-mode": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-pwsh-local": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-pwsh-sandbox": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-repeat-tool-reminder": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-sandbox-local": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-sandbox-policy": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-scope": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-checkpoint-policy": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-persistence-jsonl": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-projection": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-query": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-query-sqlite": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-reference": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-stats": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-title": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-settings": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-settings-file": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-shell-env": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-skill": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-skill-filesystem": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-spill": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-spill-local": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-spill-policy": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-subagent": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-subagent-acp": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-subagent-fork-in-process": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-subagent-in-process-driver": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-subagent-spawn-in-process": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-subprocess-local": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-system-prompt": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-terminal": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-terminal-bash": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-timeout": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-token-meter": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-ask-user": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-bash": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-bash-persistent": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-call-timeout-policy": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-cordis": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-fs": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-fs-search": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-goal": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-jobs": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-lsp": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-present": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-pwsh": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-pwsh-persistent": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-ralph": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-skill": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-str-replace-editor": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-subagent": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-subagent-control": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-terminal": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-todo": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-web": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tool-workflow": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tools": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-user-approval": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-user-questions": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-web": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-web-fetch-http": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-workflow": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-workflow-worker-thread": "0.1.5-rc.2",
     "@deepseek-ai/schemastery": "3.18.2",
     "node-addon-require-builtin": "0.1.4",
-    "@agi-fans/dsh-tui": "^0.14.0"
+    "@agi-fans/dsh-tui": "^0.16.0"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2"