@norman-else/dsh-claude 0.1.20 → 0.1.22

package/INSTALL.md

@@ -1,55 +1,55 @@
-# Agent Installation Runbook
-
-This runbook is idempotent for a local `dsh-claude` checkout and an existing DSH `web` profile.
-
-## 1. Verify the checkout
-
-```sh
-cd /path/to/dsh-claude
-export PATH="/opt/homebrew/bin:$PATH"
-pnpm install
-pnpm check
-node lib/bin.mjs doctor
-```
-
-Stop if Doctor cannot find an authenticated local Claude Code installation. Do not request, copy, or write credentials.
-
-## 2. Link the bundle into the current Web profile
-
-The bundle retains its package-contained system preset and installs a protected compatibility copy at `$DSH_HOME/.agent-presets/claude` during Host activation. This works around supported DSH release-candidate builds replacing third-party preset roots. Existing user-modified files are preserved rather than overwritten.
-
-```sh
-dsh plugin --profile web add "link:$(pwd)"
-```
-
-Do not start another DSH Web server. This bundle must load in the existing app at `http://127.0.0.1:56454`.
-
-## 3. Refresh and smoke test
-
-1. Refresh the existing DSH Web page.
-2. Confirm **Claude** appears in the new-session Agent Preset picker.
-3. Run one existing native preset prompt and verify it remains native.
-4. Create a Claude session and send a read-only prompt.
-5. Send one edit prompt; verify DSH displays a permission request. Exercise reject first, then allow once with a harmless temporary file.
-6. Cancel a running prompt and confirm the cancelled session owns no child `claude` process that is still executing cancelled work or left orphaned/unowned.
-7. Refresh the browser and continue the session.
-8. Restart DSH and confirm the next prompt resumes the persisted Claude session.
-
-A live prompt can consume the user's Claude subscription. Keep it minimal.
-
-## 4. Uninstall
-
-Clean up the managed preset while the profile can still execute the package CLI, then remove the plugin:
-
-```sh
-dsh plugin --profile web exec dsh-claude remove-preset
-dsh plugin --profile web remove @norman-else/dsh-claude
-```
-
-DSH has no plugin uninstall lifecycle hook, so direct package removal can leave the compatibility preset behind. After direct removal, no source checkout is required; run the matching package version:
-
-```sh
-pnpm dlx @norman-else/dsh-claude@<version> remove-preset
-```
-
-Cleanup refuses to delete user-modified preset content.
+# Agent Installation Runbook
+
+This runbook is idempotent for a local `dsh-claude` checkout and an existing DSH `web` profile.
+
+## 1. Verify the checkout
+
+```sh
+cd /path/to/dsh-claude
+export PATH="/opt/homebrew/bin:$PATH"
+pnpm install
+pnpm check
+node lib/bin.mjs doctor
+```
+
+Stop if Doctor cannot find an authenticated local Claude Code installation. Do not request, copy, or write credentials.
+
+## 2. Link the bundle into the current Web profile
+
+The bundle retains its package-contained system preset and installs a protected compatibility copy at `$DSH_HOME/.agent-presets/claude` during Host activation. This works around supported DSH release-candidate builds replacing third-party preset roots. Existing user-modified files are preserved rather than overwritten.
+
+```sh
+dsh plugin --profile web add "link:$(pwd)"
+```
+
+Do not start another DSH Web server. This bundle must load in the existing app at `http://127.0.0.1:56454`.
+
+## 3. Refresh and smoke test
+
+1. Refresh the existing DSH Web page.
+2. Confirm **Claude** appears in the new-session Agent Preset picker.
+3. Run one existing native preset prompt and verify it remains native.
+4. Create a Claude session and send a read-only prompt.
+5. Send one edit prompt; verify DSH displays a permission request. Exercise reject first, then allow once with a harmless temporary file.
+6. Cancel a running prompt and confirm the cancelled session owns no child `claude` process that is still executing cancelled work or left orphaned/unowned.
+7. Refresh the browser and continue the session.
+8. Restart DSH and confirm the next prompt resumes the persisted Claude session.
+
+A live prompt can consume the user's Claude subscription. Keep it minimal.
+
+## 4. Uninstall
+
+Clean up the managed preset while the profile can still execute the package CLI, then remove the plugin:
+
+```sh
+dsh plugin --profile web exec dsh-claude remove-preset
+dsh plugin --profile web remove @norman-else/dsh-claude
+```
+
+DSH has no plugin uninstall lifecycle hook, so direct package removal can leave the compatibility preset behind. After direct removal, no source checkout is required; run the matching package version:
+
+```sh
+pnpm dlx @norman-else/dsh-claude@<version> remove-preset
+```
+
+Cleanup refuses to delete user-modified preset content.

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2026 dsh-claude contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2026 dsh-claude contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,191 +1,82 @@
-# dsh-claude
-
-Run the local Claude Code CLI as a first-class main conversation inside DeepSeek Harness (DSH).
-
-`dsh-claude` does not recreate Claude Code with an API client. It starts the user's installed `claude` executable through the official Agent SDK protocol, keeps one live process per active DSH session, and leaves Claude Code in charge of its own agent loop, tools, `CLAUDE.md`, Skills, Hooks, Plugins, MCP servers, settings, and authentication.
-
-## What it adds
-
-- A `Claude` Agent Preset in the normal new-session preset picker.
-- A `claude` DSH model provider with Claude Code's `default`, `opus[1m]`, `fable`, `sonnet`, and `haiku` choices.
-- Long-lived Claude processes with per-session serialization, idle eviction, cancellation, and persisted Claude session resume.
-- DSH approval prompts for Claude tool permission requests and native DSH question forms for Claude clarifications.
-- Durable, redacted plugin-sidecar activity for thinking summaries, tool calls/results, permissions, question lifecycle, subagents, status, usage, and errors.
-- Native turn-tail activity cards and a Settings → Claude Code Doctor panel.
-- A safe CLI for Doctor and managed preset install/remove.
-
-## Requirements
-
-- macOS (v0.1 verification target).
-- DeepSeek Harness Desktop public plugin APIs on the `0.1.1-rc.2` package line.
-- A local Claude Code installation already authenticated by the user.
-- Node.js 20 or later.
-
-The plugin never manages Claude credentials. Use an already authenticated local Claude Code installation, or configure its absolute executable path in DSH.
-
-## Install in DSH
-
-Install the published package into the DSH Web profile:
-
-```sh
-dsh plugin --profile web add @norman-else/dsh-claude
-```
-
-Wait for the Web profile to rebuild, then refresh the existing DSH page. Open a new conversation and select **Claude** from the Agent Preset picker.
-
-The package ships a read-only system preset and, during Host activation, installs a protected compatibility copy at `$DSH_HOME/.agent-presets/claude`. The compatibility copy is required because supported DSH release-candidate builds replace third-party preset roots during profile boot. Installation is idempotent and never overwrites user-modified preset content.
-
-## Use
-
-1. Open a new DSH conversation.
-2. Choose **Claude** in the Agent Preset picker.
-3. Choose **Default (recommended)**, **Opus (1M context)**, **Fable**, **Sonnet**, or **Haiku**.
-4. Send a normal text prompt.
-5. Answer Claude tool permissions through the existing DSH approval UI and Claude clarifying questions through DSH's native question form.
-6. Expand **Claude Code activity** beneath a completed assistant turn to inspect the redacted execution trail.
-
-Native DSH presets remain available and keep the native DSH agent loop.
-
-### Current input boundary
-
-v0.1 forwards only the newest direct human text in a DSH step. It intentionally ignores the DSH system prompt, DSH tool schemas, and injected plugin messages because Claude Code owns those surfaces. Image-only prompts are rejected with an actionable error.
-
-## Permission and sandbox boundary
-
-Claude Code runs in its normal local configuration and can read/write `~/.claude` so that authentication, settings, plugins, and session recovery continue to work.
-
-Every Claude permission callback is bridged to `ctx.approval.request(...)`:
-
-- `allowed-once` is the only granting result.
-- reject, cancel, missing answerer, and audit failure all deny the action.
-- DSH `never` approval policy therefore fails closed.
-- DSH access modes map to Claude permission modes: `read-only` → `plan`, `workspace-write` → `acceptEdits`, and explicitly acknowledged `danger-full-access` → `bypassPermissions`.
-- Claude `AskUserQuestion` is always routed to `ctx.userQuestions`, including under Full access; cancellation or an unavailable question surface denies the interaction, and answer content is not copied into the sidecar.
-
-This is a permission-policy bridge, not kernel-level workspace confinement. The supported DSH Desktop contract exposes one writable sandbox root, while full Claude compatibility also requires writable `~/.claude`. The plugin therefore does **not** claim that paths outside the workspace are technically unwritable. It still uses DSH managed subprocess ownership for explicit argv, credential-shaped environment scrubbing, cancellation, and whole-process-tree termination.
-
-## Process and recovery behavior
-
-- One live streaming-input Claude query per active DSH session.
-- One active top-level turn at a time per session.
-- Default maximum: 4 live Claude processes.
-- Default idle eviction: 30 minutes.
-- The Claude session id and redacted presentation metadata are persisted in a plugin-owned sidecar under `$DSH_HOME/plugins/dsh-claude/sessions`; new DSH logs contain no `claude-code/*` events.
-- After normal eviction or DSH restart, the next prompt resumes that Claude session.
-- A crash after visible Claude/tool activity is reported as **outcome unknown**. The plugin never automatically replays that prompt because its side effects may already have happened.
-- Cancelling a DSH turn interrupts Claude and tears down that session's process entry (bounded interrupt, then close/abort/terminate/join); the next prompt re-establishes the process from the persisted Claude session id. Plugin unload and agent disposal also terminate the owned process tree.
-- DSH outer model retries are disabled for this provider.
-
-## Doctor
-
-Inside DSH, open **Settings → Claude Code** and run Doctor.
-
-From the checkout:
-
-```sh
-node lib/bin.mjs doctor
-node lib/bin.mjs doctor --executable /absolute/path/to/claude
-```
-
-Doctor reports only the resolved executable, version, coarse authentication category/method/provider/subscription, handshake state, configured limits, and process count. It never returns tokens, email, organization id, settings content, or environment secrets.
-
-Executable resolution order:
-
-1. configured absolute path
-2. `claude` on DSH's scrubbed PATH
-3. `~/.local/bin/claude`
-4. `/opt/homebrew/bin/claude`
-5. `/usr/local/bin/claude`
-
-To configure a nonstandard path, edit the plugin row in the Web profile composition:
-
-```yaml
-- id: llm-claude
-  name: '@norman-else/dsh-claude'
-  config:
-    executablePath: /absolute/path/to/claude
-    model: default
-    idleTimeoutMs: 1800000
-    maxProcesses: 4
-```
-
-## Development
-
-```sh
-git clone https://github.com/Norman-else/dsh-claude.git
-cd dsh-claude
-export PATH="/opt/homebrew/bin:$PATH"
-pnpm install
-pnpm check
-```
-
-To test this source checkout in DSH without publishing it:
-
-```sh
-dsh plugin --profile web add "link:$(pwd)"
-```
-
-To inspect the package that would be published:
-
-```sh
-pnpm pack --pack-destination ./dist-pack
-```
-
-### Release
-
-Update the version in `package.json`, commit it, and push the clean release commit first. Then verify and publish both npm and GitHub releases:
-
-```sh
-pnpm release:check
-pnpm release
-```
-
-The release script requires `HEAD` to match the current branch on `origin`. It runs the full project check and npm package preview, publishes the public npm package, waits for npm metadata propagation, verifies npm's `gitHead`, and creates a matching `v<version>` GitHub Release with generated notes. It is safe to rerun after a partial failure: an existing npm version or GitHub Release is accepted only when it points to the current commit.
-
-The project uses fixture/state-machine tests and a minimal SDK-level handshake probe (a tool-disabled, one-turn `query()` against the resolved local executable). Full DSH-linked live acceptance (native coexistence, Claude turn, permission allow/deny, cancel, resume, orphan-process check) is run after the Host restart per `INSTALL.md`. The Agent SDK is pinned to `0.3.233`; runtime execution is forced to the resolved local Claude executable through `pathToClaudeCodeExecutable`.
-
-## Uninstall
-
-Remove the managed compatibility preset before removing the package:
-
-```sh
-dsh plugin --profile web exec dsh-claude remove-preset
-dsh plugin --profile web remove @norman-else/dsh-claude
-```
-
-DSH does not expose a plugin uninstall lifecycle hook, so removing the package directly can leave `$DSH_HOME/.agent-presets/claude` behind. If the package was already removed, clean it up without cloning the source repository by running the matching installed version through npm:
-
-```sh
-pnpm dlx @norman-else/dsh-claude@<version> remove-preset
-```
-
-Both cleanup paths remove only installer-managed content. They fail without deleting anything if a preset file was user-modified; preserve or remove that custom content manually after review.
-
-## Troubleshooting
-
-### Claude preset appears broken
-
-Confirm the package remains installed in the intended profile with `dsh plugin --profile web why @norman-else/dsh-claude`, then restart that profile so Host activation can install or refresh the protected managed preset. You can also run `dsh plugin --profile web exec dsh-claude install-preset` explicitly.
-
-### Executable is missing
-
-Run Doctor and set an absolute `executablePath`. GUI application PATH often omits `~/.local/bin`.
-
-### Claude is signed out
-
-Run the supported local flow directly:
-
-```sh
-/absolute/path/to/claude auth login
-```
-
-DSH does not proxy login or store credentials.
-
-### A turn says “outcome unknown”
-
-Inspect the activity record and workspace before sending a new instruction. Do not repeat a potentially side-effecting prompt blindly.
-
-## Architecture records
-
-- Product and architecture spec: `docs/aegis/spec/2026-08-15-dsh-claude-spec.md`
-- Implementation plan: `docs/aegis/plan/2026-08-15-dsh-claude-implementation-plan.md`
+# dsh-claude
+
+## 1. Overview
+
+`dsh-claude` runs the locally installed Claude Code CLI as a first-class conversation provider inside DeepSeek Harness (DSH). It uses Claude Code's official Agent SDK protocol instead of recreating the agent with a separate API client.
+
+Claude Code remains responsible for its agent loop, tools, `CLAUDE.md`, Skills, Hooks, Plugins, MCP servers, settings, and authentication. DSH provides the conversation UI, approval and question surfaces, repository workflow, activity presentation, and managed process lifetime.
+
+## 2. Installation and removal
+
+### Requirements
+
+- DeepSeek Harness Desktop with compatible public plugin APIs. This package is currently developed against the DSH `0.1.1-rc.2` package line.
+- A local Claude Code installation that is already authenticated.
+- Node.js 20 or later when installing from a source checkout.
+
+The plugin never asks for or stores Claude credentials. Authenticate through the local Claude Code CLI before using the plugin.
+
+### Install from npm
+
+Add the published package to the DSH Web profile:
+
+```sh
+dsh plugin --profile web add @norman-else/dsh-claude
+```
+
+Wait for the profile rebuild to finish, then restart DSH Desktop if requested. Create a new conversation and select **Claude** from the Agent Preset picker.
+
+### Install from source
+
+```sh
+git clone https://github.com/Norman-else/dsh-claude.git
+cd dsh-claude
+pnpm install
+pnpm check
+```
+
+Link the checkout to DSH from PowerShell:
+
+```powershell
+dsh plugin --profile web add "link:$PWD"
+```
+
+Or from macOS/Linux:
+
+```sh
+dsh plugin --profile web add "link:$(pwd)"
+```
+
+### Remove the plugin
+
+Remove the managed compatibility preset before removing the package:
+
+```sh
+dsh plugin --profile web exec dsh-claude remove-preset
+dsh plugin --profile web remove @norman-else/dsh-claude
+```
+
+DSH does not currently expose a plugin uninstall lifecycle hook. If the package was removed before its managed preset was cleaned up, run the matching installed version directly:
+
+```sh
+pnpm dlx @norman-else/dsh-claude@<version> remove-preset
+```
+
+Preset cleanup removes only installer-managed content and refuses to delete user-modified preset files.
+
+## 3. Features
+
+- **Native Claude Code conversations** — Runs Claude Code as the main agent in a normal DSH conversation instead of wrapping it as a tool or secondary chat.
+- **Claude preset and model selection** — Adds a `Claude` Agent Preset and exposes Claude Code's `default`, `opus[1m]`, `fable`, `sonnet`, and `haiku` model choices.
+- **Local Claude environment compatibility** — Preserves the user's existing Claude Code authentication, settings, `CLAUDE.md`, Skills, Hooks, Plugins, tools, and MCP configuration.
+- **Real-time streaming and conversation continuity** — Streams Claude responses and tool activity into DSH while retaining multi-turn context and persisted Claude session resume.
+- **DSH permissions and questions** — Routes Claude tool permission requests through DSH approvals and Claude clarification prompts through DSH's native question forms.
+- **Managed process lifecycle** — Keeps one live Claude process per active session, serializes turns, evicts idle processes, and handles Stop, cancellation, restart, and process-tree cleanup.
+- **Redacted activity timeline** — Displays thinking summaries, tool calls and results, permission events, questions, status changes, usage, errors, and subagent activity without persisting credentials.
+- **Background task tracking** — Shows running and completed Claude subagents or background tasks with task status, recent tools, and expandable activity.
+- **Repository and worktree preparation** — Lets a user choose a branch before submitting, switch an eligible local branch, or create a dedicated Git worktree and DSH workspace while transferring the current draft and attachments.
+- **Repository and pull request status** — Shows the current repository, branch, worktree state, changed-line counts, unpushed commits, GitHub pull request, checks, review state, merge state, and blocking Claude rate limits near the composer.
+- **Diff viewer and review comments** — Provides an expandable or maximized branch diff, including file statistics and line-level review comments that are attached to the next Claude message.
+- **Commit, push, and pull request actions** — Supports Commit, Commit & Push, Push, and draft pull request creation, with repository snapshot validation and optional Claude-generated commit messages.
+- **Claude Code settings and Doctor** — Adds a Settings panel for runtime diagnostics, supported Claude settings, worktree branch prefix, process limits, authentication and handshake status, and safe npm update checks.
+- **Managed preset compatibility** — Installs an idempotent compatibility copy of the Claude preset for supported DSH builds without overwriting user-modified preset content.

package/cordis.patch.yml

@@ -1,12 +1,12 @@
-# dsh-claude host bundle. The preset stays inside this package as a system
-# preset, so removing the profile dependency removes the complete integration.
-- id: agent-presets
-  config:
-    default: standard
-    roots:
-      - path: !!js "process.getBuiltinModule('node:path').join(process.getBuiltinModule('node:path').dirname(process.getBuiltinModule('node:module').createRequire(ctx.baseUrl).resolve('@norman-else/dsh-claude/package.json')), 'preset')"
-        trust: system
-
-- insert:
-    - id: llm-claude
-      name: '@norman-else/dsh-claude'
+# dsh-claude host bundle. The preset stays inside this package as a system
+# preset, so removing the profile dependency removes the complete integration.
+- id: agent-presets
+  config:
+    default: standard
+    roots:
+      - path: !!js "process.getBuiltinModule('node:path').join(process.getBuiltinModule('node:path').dirname(process.getBuiltinModule('node:module').createRequire(ctx.baseUrl).resolve('@norman-else/dsh-claude/package.json')), 'preset')"
+        trust: system
+
+- insert:
+    - id: llm-claude
+      name: '@norman-else/dsh-claude'

package/legacy-preset/agent.cordis.yml

@@ -1,11 +1,11 @@
-# Shipped by dsh-claude. Claude Code owns the inner agent loop and tools;
-# this system preset contributes only the request-route override. DSH resolves
-# the bare package specifier from the host profile when mounting system roots.
-- id: claude-code-route
-  name: '@norman-else/dsh-claude/preset-route'
-  # Entry-local isolate realm: each session's preset mount gets its own
-  # claudeCommands service instance (keeps mountPreset's leaked-service check
-  # happy and prevents cross-session collisions). The host reads it through
-  # dsh-agent-presets' serviceForAgent().
-  isolate:
-    claudeCommands: true
+# Shipped by dsh-claude. Claude Code owns the inner agent loop and tools;
+# this system preset contributes only the request-route override. DSH resolves
+# the bare package specifier from the host profile when mounting system roots.
+- id: claude-code-route
+  name: '@norman-else/dsh-claude/preset-route'
+  # Entry-local isolate realm: each session's preset mount gets its own
+  # claudeCommands service instance (keeps mountPreset's leaked-service check
+  # happy and prevents cross-session collisions). The host reads it through
+  # dsh-agent-presets' serviceForAgent().
+  isolate:
+    claudeCommands: true

package/legacy-preset/preset.yml

@@ -1,4 +1,4 @@
-# Shipped by dsh-claude. Copy this system preset under a new id to customize it.
-name: Claude
-description: Use the local Claude Code as the complete agent runtime inside DSH.
-order: 10
+# Shipped by dsh-claude. Copy this system preset under a new id to customize it.
+name: Claude
+description: Use the local Claude Code as the complete agent runtime inside DSH.
+order: 10

package/lib/bin.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"bin.mjs","names":[],"sources":["../src/bin.ts"],"sourcesContent":["#!/usr/bin/env node\r\n\r\nimport { access } from 'node:fs/promises'\r\nimport { constants } from 'node:fs'\r\nimport { homedir } from 'node:os'\r\nimport { delimiter, isAbsolute, join } from 'node:path'\r\nimport { spawnSync } from 'node:child_process'\r\nimport { scrubbedParentEnv } from '@deepseek-ai/dsh-subprocess'\r\nimport { parseClaudeVersion } from './executable.ts'\r\nimport { ensureManagedPreset, removeManagedPreset } from './preset-installer.ts'\r\n\r\nfunction option(name: string): string | undefined {\r\n  const index = process.argv.indexOf(name)\r\n  return index < 0 ? undefined : process.argv[index + 1]\r\n}\r\n\r\nasync function executable(configured?: string): Promise<string | undefined> {\r\n  const candidates: string[] = []\r\n  if (configured !== undefined) candidates.push(configured)\r\n  else {\r\n    for (const directory of (process.env.PATH ?? '').split(delimiter)) {\r\n      if (directory.length > 0) candidates.push(join(directory, 'claude'))\r\n    }\r\n    candidates.push(join(homedir(), '.local', 'bin', 'claude'), '/opt/homebrew/bin/claude', '/usr/local/bin/claude')\r\n  }\r\n  for (const candidate of [...new Set(candidates)]) {\r\n    if (!isAbsolute(candidate)) continue\r\n    try {\r\n      await access(candidate, constants.X_OK)\r\n      return candidate\r\n    } catch {\r\n      // Continue to the next documented candidate.\r\n    }\r\n  }\r\n  return undefined\r\n}\r\n\r\nfunction run(executablePath: string, args: string[]) {\r\n  return spawnSync(executablePath, args, {\r\n    encoding: 'utf8',\r\n    env: scrubbedParentEnv(),\r\n    timeout: 15_000,\r\n    windowsHide: true,\r\n  })\r\n}\r\n\r\nasync function doctor(): Promise<number> {\r\n  const configured = option('--executable') ?? process.env.DSH_CLAUDE_CODE_EXECUTABLE\r\n  const path = await executable(configured)\r\n  if (path === undefined) {\r\n    process.stdout.write(`${JSON.stringify({\r\n      executable: { status: 'missing', searched: configured === undefined ? ['claude', '~/.local/bin/claude', '/opt/homebrew/bin/claude', '/usr/local/bin/claude'] : [configured] },\r\n      version: { status: 'not-run' },\r\n      authentication: { status: 'not-run' },\r\n      message: 'Set executablePath to an absolute Claude Code CLI path',\r\n    }, null, 2)}\\n`)\r\n    return 1\r\n  }\r\n  const versionProbe = run(path, ['--version'])\r\n  const version = parseClaudeVersion(`${versionProbe.stdout ?? ''}\\n${versionProbe.stderr ?? ''}`)\r\n  const authProbe = run(path, ['auth', 'status', '--json'])\r\n  let authentication: Record<string, unknown> = { status: 'unknown' }\r\n  if (authProbe.status === 0) {\r\n    try {\r\n      const value = JSON.parse(authProbe.stdout) as Record<string, unknown>\r\n      authentication = {\r\n        status: value.loggedIn === true ? 'signed-in' : 'signed-out',\r\n        ...(typeof value.authMethod === 'string' ? { method: value.authMethod } : {}),\r\n        ...(typeof value.apiProvider === 'string' ? { provider: value.apiProvider } : {}),\r\n        ...(typeof value.subscriptionType === 'string' ? { subscription: value.subscriptionType } : {}),\r\n      }\r\n    } catch {\r\n      authentication = { status: 'unknown', message: 'Authentication status was not valid JSON' }\r\n    }\r\n  }\r\n  process.stdout.write(`${JSON.stringify({\r\n    executable: { status: 'found', path },\r\n    version: version === undefined ? { status: 'error' } : { status: 'ok', value: version },\r\n    authentication,\r\n    handshake: 'not-run',\r\n  }, null, 2)}\\n`)\r\n  return version === undefined ? 1 : 0\r\n}\r\n\r\nasync function main(): Promise<number> {\r\n  const command = process.argv[2] ?? 'doctor'\r\n  if (command === 'doctor') return doctor()\r\n  if (command === 'install-preset') {\r\n    process.stdout.write(`${await ensureManagedPreset()}\\n`)\r\n    return 0\r\n  }\r\n  if (command === 'remove-preset') {\r\n    process.stdout.write(`${await removeManagedPreset()}\\n`)\r\n    return 0\r\n  }\r\n  process.stderr.write(`Usage: dsh-claude [doctor [--executable PATH] | install-preset | remove-preset]\\n`)\r\n  return 2\r\n}\r\n\r\ntry {\r\n  process.exitCode = await main()\r\n} catch (error) {\r\n  process.stderr.write(`${error instanceof Error ? error.message : String(error)}\\n`)\r\n  process.exitCode = 1\r\n}\r\n"],"mappings":"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"}
+{"version":3,"file":"bin.mjs","names":[],"sources":["../src/bin.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport { access } from 'node:fs/promises'\nimport { constants } from 'node:fs'\nimport { homedir } from 'node:os'\nimport { delimiter, isAbsolute, join } from 'node:path'\nimport { spawnSync } from 'node:child_process'\nimport { scrubbedParentEnv } from '@deepseek-ai/dsh-subprocess'\nimport { parseClaudeVersion } from './executable.ts'\nimport { ensureManagedPreset, removeManagedPreset } from './preset-installer.ts'\n\nfunction option(name: string): string | undefined {\n  const index = process.argv.indexOf(name)\n  return index < 0 ? undefined : process.argv[index + 1]\n}\n\nasync function executable(configured?: string): Promise<string | undefined> {\n  const candidates: string[] = []\n  if (configured !== undefined) candidates.push(configured)\n  else {\n    for (const directory of (process.env.PATH ?? '').split(delimiter)) {\n      if (directory.length > 0) candidates.push(join(directory, 'claude'))\n    }\n    candidates.push(join(homedir(), '.local', 'bin', 'claude'), '/opt/homebrew/bin/claude', '/usr/local/bin/claude')\n  }\n  for (const candidate of [...new Set(candidates)]) {\n    if (!isAbsolute(candidate)) continue\n    try {\n      await access(candidate, constants.X_OK)\n      return candidate\n    } catch {\n      // Continue to the next documented candidate.\n    }\n  }\n  return undefined\n}\n\nfunction run(executablePath: string, args: string[]) {\n  return spawnSync(executablePath, args, {\n    encoding: 'utf8',\n    env: scrubbedParentEnv(),\n    timeout: 15_000,\n    windowsHide: true,\n  })\n}\n\nasync function doctor(): Promise<number> {\n  const configured = option('--executable') ?? process.env.DSH_CLAUDE_CODE_EXECUTABLE\n  const path = await executable(configured)\n  if (path === undefined) {\n    process.stdout.write(`${JSON.stringify({\n      executable: { status: 'missing', searched: configured === undefined ? ['claude', '~/.local/bin/claude', '/opt/homebrew/bin/claude', '/usr/local/bin/claude'] : [configured] },\n      version: { status: 'not-run' },\n      authentication: { status: 'not-run' },\n      message: 'Set executablePath to an absolute Claude Code CLI path',\n    }, null, 2)}\\n`)\n    return 1\n  }\n  const versionProbe = run(path, ['--version'])\n  const version = parseClaudeVersion(`${versionProbe.stdout ?? ''}\\n${versionProbe.stderr ?? ''}`)\n  const authProbe = run(path, ['auth', 'status', '--json'])\n  let authentication: Record<string, unknown> = { status: 'unknown' }\n  if (authProbe.status === 0) {\n    try {\n      const value = JSON.parse(authProbe.stdout) as Record<string, unknown>\n      authentication = {\n        status: value.loggedIn === true ? 'signed-in' : 'signed-out',\n        ...(typeof value.authMethod === 'string' ? { method: value.authMethod } : {}),\n        ...(typeof value.apiProvider === 'string' ? { provider: value.apiProvider } : {}),\n        ...(typeof value.subscriptionType === 'string' ? { subscription: value.subscriptionType } : {}),\n      }\n    } catch {\n      authentication = { status: 'unknown', message: 'Authentication status was not valid JSON' }\n    }\n  }\n  process.stdout.write(`${JSON.stringify({\n    executable: { status: 'found', path },\n    version: version === undefined ? { status: 'error' } : { status: 'ok', value: version },\n    authentication,\n    handshake: 'not-run',\n  }, null, 2)}\\n`)\n  return version === undefined ? 1 : 0\n}\n\nasync function main(): Promise<number> {\n  const command = process.argv[2] ?? 'doctor'\n  if (command === 'doctor') return doctor()\n  if (command === 'install-preset') {\n    process.stdout.write(`${await ensureManagedPreset()}\\n`)\n    return 0\n  }\n  if (command === 'remove-preset') {\n    process.stdout.write(`${await removeManagedPreset()}\\n`)\n    return 0\n  }\n  process.stderr.write(`Usage: dsh-claude [doctor [--executable PATH] | install-preset | remove-preset]\\n`)\n  return 2\n}\n\ntry {\n  process.exitCode = await main()\n} catch (error) {\n  process.stderr.write(`${error instanceof Error ? error.message : String(error)}\\n`)\n  process.exitCode = 1\n}\n"],"mappings":"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"}

package/lib/client.d.ts

@@ -190,6 +190,13 @@ declare const en: {
   readonly diffCommitCompleted: "Created commit {commit}";
   readonly diffCommitPreserved: "Local commit {commit} was preserved.";
   readonly diffOpenPr: "Open pull request";
+  readonly diffMergePr: "Merge";
+  readonly repositoryMergeMenu: "Open merge options";
+  readonly diffMerge_merge: "Create a merge commit";
+  readonly diffMerge_squash: "Squash and merge";
+  readonly diffMerge_rebase: "Rebase and merge";
+  readonly diffMergeDescription: "Merge the pull request for this branch with the selected method.";
+  readonly diffMergeCompleted: "Merged PR #{number}";
   readonly reviewCommentAdd: "Add line comment";
   readonly reviewCommentPlaceholder: "Request changes";
   readonly reviewCommentSubmit: "Comment";