@norman-else/dsh-claude 0.1.45 → 0.1.46

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

@@ -231,7 +231,8 @@ declare const en: {
   readonly promptSaveExists: "A prompt with that name already exists. Try another.";
   readonly promptSaveFailed: "Could not save: {message}";
   readonly presetHeaderHint: "The agent preset this session runs";
-  readonly diffWorkingTree: "Branch changes";
+  readonly diffRepository: "Repository";
+  readonly repositoryLinked: "Linked repository: changed by this session";
   readonly diffFiles: "{count} modified file(s)";
   readonly diffFilesShort: "{count} files";
   readonly diffTruncated: "The diff exceeds the safe display limit. Use the terminal to inspect the complete content.";
@@ -282,6 +283,7 @@ declare const en: {
   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 diffMergeAdmin: "Merge as administrator (bypass branch protection)";
   readonly diffMergeCompleted: "Merged PR #{number}";
   readonly diffUpdateBranch: "Update branch…";
   readonly repositoryUpdateBranch: "Update branch";