@linxin666/dsh-ssh 0.3.6 → 0.3.9

package/lib/index.js

@@ -1,4 +1,3 @@
-import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
 import { closeSync, createReadStream, createWriteStream, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { Client } from "ssh2";
 import { homedir, tmpdir } from "node:os";
@@ -3560,7 +3559,7 @@ const inject = [
 * surface edits. Spelled here rather than imported: the browser half spells
 * the same value and must not depend on a Host package.
 */
-const SSH_SETTINGS_NAMESPACE = settingsNamespace("dsh-ssh");
+const SSH_SETTINGS_NAMESPACE = "dsh-ssh";
 const Config = import_lib.default.object({
 	announceToAgent: import_lib.default.boolean().default(false),
 	enabled: import_lib.default.boolean().default(true),
@@ -3580,18 +3579,21 @@ const SSH_GUIDANCE = "本机已安装 dsh-ssh 插件（DSH 远程 SSH 运维）
 const apply = mountOnce("@linxin666/dsh-ssh", applyImpl);
 function applyImpl(ctx, config) {
 	let current = () => config ?? {};
+	let isSettingsBound = false;
+	const store = new HostStore();
+	const engine = new SshEngine(store);
+	ctx.effect(() => () => {
+		engine.dispose();
+	}, "dsh-ssh: engine");
 	const resolve = () => {
 		const value = current();
+		let enabled = value.enabled ?? true;
+		if (enabled === false && !isSettingsBound && store.list().length > 0) enabled = true;
 		return {
 			announceToAgent: value.announceToAgent ?? DEFAULT_ANNOUNCE,
-			enabled: value.enabled ?? true
+			enabled
 		};
 	};
-	const store = new HostStore();
-	const engine = new SshEngine(store);
-	ctx.effect(() => () => {
-		engine.dispose();
-	}, "dsh-ssh: engine");
 	const { routes, upgrade } = makeRoutes({
 		store,
 		engine
@@ -3642,12 +3644,15 @@ function applyImpl(ctx, config) {
 			};
 		}, "dsh-ssh: tools");
 	};
-	installSettingsSection(ctx, SSH_SETTINGS_NAMESPACE, Config, config ?? {}, {
-		setSource: (source) => {
-			current = source;
-			sync();
-		},
-		onChange: sync
+	ctx.inject(["settings"], (settingsCtx) => {
+		settingsCtx.settings.installSection(ctx, SSH_SETTINGS_NAMESPACE, Config, config ?? {}, {
+			setSource: (source) => {
+				isSettingsBound = true;
+				current = source;
+				sync();
+			},
+			onChange: sync
+		});
 	});
 	sync();
 }

package/lib/types/client/index.d.ts

@@ -10,7 +10,8 @@
  * Export discipline (packages/client rule): the /client surface carries what
  * cordis loading needs plus types only — all value exports stay internal.
  */
-import type { ClientContext, SettingsScope, SettingsScopeSpec } from '@deepseek-ai/dsh-client-runtime/client';
+import type { Context as ClientContext } from '@deepseek-ai/cordis';
+import type { SettingsScope, SettingsScopeSpec } from '@deepseek-ai/dsh-client-ui-settings/client';
 import { type SshKey } from './locales.ts';
 declare module '@deepseek-ai/cordis' {
     interface Context {

package/lib/types/client/locales.d.ts

@@ -146,6 +146,7 @@ export declare const zh: {
     readonly 'common.error': "出错：{error}";
     readonly 'common.refresh': "刷新";
     readonly 'common.confirm': "确定";
+    readonly 'error.disabled': "SSH 插件在宿主端未启用。请前往「设置 → Web 插件 → SSH」打开 enabled 开关。";
 };
 export declare const en: Record<keyof typeof zh, string>;
 /** Locale key union. */

package/lib/types/index.d.ts

@@ -8,6 +8,7 @@
  * no dsh source changes.
  */
 import type { Context } from '@deepseek-ai/cordis';
+import type { SettingsNamespace } from '@deepseek-ai/dsh-settings';
 import z from 'schemastery';
 /** Stable cordis plugin name. */
 export declare const name = "ssh";
@@ -18,7 +19,7 @@ export declare const inject: string[];
  * surface edits. Spelled here rather than imported: the browser half spells
  * the same value and must not depend on a Host package.
  */
-export declare const SSH_SETTINGS_NAMESPACE: import("@deepseek-ai/dsh-settings").SettingsNamespace;
+export declare const SSH_SETTINGS_NAMESPACE: SettingsNamespace;
 /** Plugin config, validated by the same-named schemastery schema. */
 export interface Config {
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-ssh",
   "description": "Remote SSH operations for the dsh web GUI: host config store (~/.dsh/dsh-ssh.json, import from ~/.ssh/config), a persistent ssh2 connection pool with jump-host support, exec / PTY web terminal / SFTP transfer / local port-forward tunnels / cluster execution, plus agent tools (ssh_list, ssh_exec, ssh_upload, ssh_download, ssh_tunnel, ssh_cluster). Hot-pluggable — mounted via ~/.dsh/cordis.patch.yml + a profile node_modules symlink, no dsh source changes.",
-  "version": "0.3.6",
+  "version": "0.3.9",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"
@@ -26,15 +26,15 @@
   },
   "dsh": {
     "engines": {
-      "dsh": ">=0.1.1-rc.1"
+      "dsh": ">=0.1.2-alpha.1"
     },
     "bundle": {
       "patch": "./cordis.patch.yml"
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-connection",
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-renderer",
         "@deepseek-ai/dsh-client-ui-settings"
       ],
       "platform": "web"
@@ -51,19 +51,19 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-client-connection": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-locale": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-scope": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-settings": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-timeout": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.1-rc.2",
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-client-connection": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-scope": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-settings": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-timeout": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-tools": "^0.1.2-alpha.2",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
     "@types/react-dom": "^18.3.5",

package/src/client/api.ts

@@ -18,6 +18,7 @@ import {
   type TransferStreamLine,
   type TunnelInfo,
 } from '../protocol.ts'
+import { tt } from './panel/helpers.ts'
 
 /** Minimal File System Access API surface (not in all lib.dom versions). */
 interface WindowWithFileSystemAccess {
@@ -51,12 +52,15 @@ async function readJson<T>(response: Response): Promise<T> {
   try {
     body = await response.json()
   } catch {
+    if (response.status === 404) {
+      throw new SshApiError(tt('error.disabled'))
+    }
     throw new SshApiError(`HTTP ${response.status}: invalid JSON response`)
   }
   if (!response.ok) {
     const message = typeof body === 'object' && body !== null && typeof (body as { error?: unknown }).error === 'string'
       ? (body as { error: string }).error
-      : `HTTP ${response.status}`
+      : (response.status === 404 ? tt('error.disabled') : `HTTP ${response.status}`)
     throw new SshApiError(message)
   }
   return body as T

package/src/client/index.ts

@@ -10,11 +10,14 @@
  * Export discipline (packages/client rule): the /client surface carries what
  * cordis loading needs plus types only — all value exports stay internal.
  */
-import type { ClientContext, SettingsScope, SettingsScopeSpec } from '@deepseek-ai/dsh-client-runtime/client'
+import type { Context as ClientContext } from '@deepseek-ai/cordis'
+import type { SettingsScope, SettingsScopeSpec } from '@deepseek-ai/dsh-client-ui-settings/client'
 // Type-only: pulls the locale plugin's Context merge (ctx.locale).
 import type {} from '@deepseek-ai/dsh-client-locale/client'
 // Type-only: pulls the settings-surface Context merge (ctx.settingsScope).
 import type {} from '@deepseek-ai/dsh-client-ui-settings/client'
+// Type-only: pulls the ctx.slots merge (the renderer owns the slot registry since 0.1.2).
+import type {} from '@deepseek-ai/dsh-client-ui-renderer/client'
 // Type-only: pulls the LocaleNamespaceMap merge table.
 import type {} from '@deepseek-ai/dsh-client-ui-slots'
 import { SshApi } from './api.ts'

package/src/client/locales.ts

@@ -154,6 +154,7 @@ export const zh = {
   'common.error': '出错：{error}',
   'common.refresh': '刷新',
   'common.confirm': '确定',
+  'error.disabled': 'SSH 插件在宿主端未启用。请前往「设置 → Web 插件 → SSH」打开 enabled 开关。',
 } as const
 
 export const en: Record<keyof typeof zh, string> = {
@@ -301,6 +302,7 @@ export const en: Record<keyof typeof zh, string> = {
   'common.error': 'Error: {error}',
   'common.refresh': 'Refresh',
   'common.confirm': 'Confirm',
+  'error.disabled': 'The SSH plugin is disabled on the host. Please enable it in Settings → Web Plugins → SSH.',
 }
 
 /** Locale key union. */

package/src/dsh-home.ts

@@ -39,4 +39,4 @@ export function resolveDshHome(env: NodeJS.ProcessEnv = process.env, home: strin
 /** Resolve the DSH home directory from the live environment. */
 export function dshHome(): string {
   return resolveDshHome()
-}
+}

package/src/index.ts

@@ -9,7 +9,7 @@
  */
 
 import type { Context } from '@deepseek-ai/cordis'
-import { installSettingsSection, settingsNamespace } from '@deepseek-ai/dsh-settings'
+import type { SettingsNamespace } from '@deepseek-ai/dsh-settings'
 import z from 'schemastery'
 import type {} from '@deepseek-ai/dsh-host-webserver'
 import type {} from '@deepseek-ai/dsh-system-prompt'
@@ -31,7 +31,7 @@ export const inject = ['webServer', 'tools', 'systemPrompt']
  * surface edits. Spelled here rather than imported: the browser half spells
  * the same value and must not depend on a Host package.
  */
-export const SSH_SETTINGS_NAMESPACE = settingsNamespace('dsh-ssh')
+export const SSH_SETTINGS_NAMESPACE = 'dsh-ssh' as SettingsNamespace
 
 /** Plugin config, validated by the same-named schemastery schema. */
 export interface Config {
@@ -77,18 +77,28 @@ function applyImpl(ctx: Context, config?: Config): void {
   // The live source the surfaces read: the settings section once the web
   // settings surface is served, the composition entry otherwise.
   let current: () => Config = () => config ?? {}
+  let isSettingsBound = false
+
+  const store = new HostStore()
+  const engine = new SshEngine(store)
+  ctx.effect(() => () => { engine.dispose() }, 'dsh-ssh: engine')
+
   const resolve = (): Config => {
     const value = current()
+    let enabled = value.enabled ?? true
+    // When dsh-ssh was seeded with enabled: false (e.g. from an aggregate profile line),
+    // but the user has never explicitly configured settings (not bound yet)
+    // AND already has active host records in dsh-ssh.json, keep the plugin enabled so
+    // existing users are not broken upon upgrade (#1250).
+    if (enabled === false && !isSettingsBound && store.list().length > 0) {
+      enabled = true
+    }
     return {
       announceToAgent: value.announceToAgent ?? DEFAULT_ANNOUNCE,
-      enabled: value.enabled ?? true,
+      enabled,
     }
   }
 
-  const store = new HostStore()
-  const engine = new SshEngine(store)
-  ctx.effect(() => () => { engine.dispose() }, 'dsh-ssh: engine')
-
   // The /api/dsh-ssh route family + terminal upgrade.
   const { routes, upgrade } = makeRoutes({ store, engine })
   let disposeRoutes: (() => void) | undefined
@@ -152,15 +162,18 @@ function applyImpl(ctx: Context, config?: Config): void {
     )
   }
 
-  installSettingsSection(ctx, SSH_SETTINGS_NAMESPACE, Config, config ?? {}, {
-    setSource: (source) => {
-      current = source
-      sync()
-    },
-    onChange: sync,
+  ctx.inject(['settings'], (settingsCtx) => {
+    settingsCtx.settings.installSection(ctx, SSH_SETTINGS_NAMESPACE, Config, config ?? {}, {
+      setSource: (source) => {
+        isSettingsBound = true
+        current = source
+        sync()
+      },
+      onChange: sync,
+    })
   })
 
   // Initial registration from the composition entry (covers deployments with
-  // no settings service, whose installSettingsSection never fires its hooks).
+  // no settings service, whose installSection never fires its hooks).
   sync()
 }