@artenx/dshb 0.1.33 → 0.1.35

package/lib/{session-sync-BuOJvFxK.d.ts → session-sync-DrKShc5c.d.ts}

@@ -1,12 +1,12 @@
 import { o as NodeRegistry } from "./node-registry-BTnnM5-k.js";
 import { r as WorkspaceBindingsStore } from "./workspace-bindings-CsB0TIJB.js";
 import { r as SyncRevision } from "./revision-C9sOlDZ6.js";
-import { d as SyncSessionArchive, i as SyncOrigin, l as SyncRecordMetadata, r as SyncImportMethod } from "./model-BP7Gw1yk.js";
-import { n as SyncStateStore } from "./stores-CKyEt0yk.js";
-import { s as SyncNodeService } from "./node-sync-3Z9QLz2n.js";
+import { d as SyncSessionArchive, i as SyncOrigin, l as SyncRecordMetadata, r as SyncImportMethod } from "./model-CKTBf-Pl.js";
+import { n as SyncStateStore } from "./stores-puyTC075.js";
+import { s as SyncNodeService } from "./node-sync-C3Ym-HDu.js";
 import { S as BrandedNumber, _ as FileAttachmentRef, a as SystemPromptUpdate, b as TypertResource, c as ToolSchema, d as Message, f as SystemMessage, g as ToolCallId, i as LlmFailure, l as AssistantMessage, m as UserMessage, n as LlmCallConfig, o as TokenUsage, p as ToolResultMessage, r as LlmCallConfigAdapterDefaults, s as ToolHistory, t as AssistantStreamRecord, u as DeveloperMessage, v as ImageAttachmentRef, x as Branded, y as TypertLookup } from "./index-VF8bcBeX.js";
 import { a as SessionInstructionSnapshotStore } from "./workspace-instructions-DirYYiku.js";
-import { t as SyncSessionJournalStore } from "./session-journal-pgPqcWn9.js";
+import { t as SyncSessionJournalStore } from "./session-journal-VE_1tA2-.js";
 import { Context, Service } from "@deepseek-ai/cordis";
 //#region ../../node_modules/@deepseek-ai/dsh-scope/lib/types/index.d.ts
 declare const ScopedBrand: unique symbol;
@@ -1314,6 +1314,12 @@ declare class SyncSessionService {
   applyBundle(value: unknown, sourceName: string, peerId?: string, options?: SyncSessionApplyOptions): Promise<SyncSessionApplyResult>;
   preflightBundle(value: unknown, options?: SyncSessionApplyOptions): void;
   pendingPeerIds(): string[];
+  /**
+   * 丢弃指定对端的全部未完成 journal 批次（含正在应用中的当前批）。
+   * 手动停止同步时调用：未应用的条目不再落地，重启后也不会回放；
+   * 已应用完成的条目不受影响。
+   */
+  discardPendingBatches(peerId: string): number;
   recoverPending(): Promise<void>;
   cleanupOrphanedStaging(): void;
   listArchives(): SyncSessionArchive[];
@@ -1363,4 +1369,4 @@ declare class SyncSessionService {
 }
 //#endregion
 export { sessionEventListDigest as C, validateSyncSessionManifest as D, validateSyncSessionBundle as E, planSessionTransfers as S, validateObjectPayload as T, SyncSessionWorkspace as _, SyncSessionBundle as a, makeSyncSessionBundle as b, SyncSessionEventDelta as c, SyncSessionManifest as d, SyncSessionManifestEntry as f, SyncSessionTransferPlan as g, SyncSessionService as h, SyncSessionApplyResult as i, SyncSessionEventPrefix as l, SyncSessionObjectInbox as m, SyncObjectInboxWriter as n, SyncSessionEntry as o, SyncSessionObject as p, SyncSessionApplyOptions as r, SyncSessionError as s, ExportObjectCache as t, SyncSessionInstructionSnapshot as u, WorkspaceRegistryLike as v, syncSessionEntryKey as w, makeSyncSessionManifest as x, estimateJsonBytes as y };
-//# sourceMappingURL=session-sync-BuOJvFxK.d.ts.map
+//# sourceMappingURL=session-sync-DrKShc5c.d.ts.map

package/lib/{ssh-transport-C7povM0s.d.ts → ssh-transport-BxPWfu9X.d.ts}

@@ -1,9 +1,9 @@
-import { a as SyncPeer } from "./model-BP7Gw1yk.js";
-import { i as SyncNodeManifest, t as SyncNodeApplyResult } from "./node-sync-3Z9QLz2n.js";
+import { a as SyncPeer } from "./model-CKTBf-Pl.js";
+import { i as SyncNodeManifest, t as SyncNodeApplyResult } from "./node-sync-C3Ym-HDu.js";
 import { SyncPeerManager, SyncPeerSecrets } from "./core/sync/peer-manager.js";
-import { r as SyncHostKeyChallenges, t as SyncHostKeyChallengeError } from "./host-key-C5afhAUd.js";
+import { r as SyncHostKeyChallenges, t as SyncHostKeyChallengeError } from "./host-key-CSnpIrjq.js";
 import { d as SyncFrame } from "./protocol-DJ0zyVlB.js";
-import { a as SyncSessionBundle, d as SyncSessionManifest, i as SyncSessionApplyResult, l as SyncSessionEventPrefix, p as SyncSessionObject } from "./session-sync-BuOJvFxK.js";
+import { a as SyncSessionBundle, d as SyncSessionManifest, i as SyncSessionApplyResult, l as SyncSessionEventPrefix, p as SyncSessionObject } from "./session-sync-DrKShc5c.js";
 import { Client, ClientChannel, ConnectConfig } from "ssh2";
 //#region src/core/sync/ssh-transport.d.ts
 type SyncSshErrorCategory = 'auth' | 'network' | 'hostkey' | 'timeout' | 'helper' | 'protocol';
@@ -25,6 +25,7 @@ interface SyncRemoteNodeManifest extends SyncNodeManifest {
 declare class SyncSshSession {
   private readonly client;
   private readonly channel;
+  private readonly onClosed?;
   private readonly decoder;
   private readonly closeSignal;
   private reading;
@@ -32,7 +33,7 @@ declare class SyncSshSession {
   private inputEnded;
   private nextDataSequence;
   private pendingError;
-  constructor(client: Client, channel: ClientChannel);
+  constructor(client: Client, channel: ClientChannel, onClosed?: (() => void) | undefined);
   sendControl(value: Record<string, unknown>): Promise<void>;
   sendData(sequence: number, data: Buffer): Promise<void>;
   endInput(): void;
@@ -44,7 +45,13 @@ declare function buildSyncSshConnectConfig(peer: SyncPeer, secrets: SyncPeerSecr
 declare class SyncSshTransport {
   private readonly peerManager;
   private readonly hostKeyChallenges;
+  /** 每对端当前打开的 SSH 会话：手动停止同步时立即关闭通道，等待中的 readFrames 随即返回。 */
+  private readonly openSessions;
   constructor(peerManager: SyncPeerManager);
+  private trackSession;
+  private untrackSession;
+  /** 立即关闭该对端的全部活跃 SSH 会话（幂等；用于手动停止同步）。 */
+  stopActiveSessions(peerId: string): number;
   probe(peerId: string): Promise<SyncRemoteHandshake>;
   openSession(peerId: string): Promise<{
     peer: SyncPeer;
@@ -112,4 +119,4 @@ declare class SyncRemoteProbe {
 }
 //#endregion
 export { parseRemoteProbeOutput as _, SyncRemoteProbe as a, SyncRemoteProbeProfile as c, SyncSshErrorCategory as d, SyncSshProbeError as f, buildSyncSshConnectConfig as g, buildRemoteProbeScript as h, SyncRemoteNodeManifest as i, SyncRemoteProbeResult as l, SyncSshTransport as m, REMOTE_PROBE_END_MARKER as n, SyncRemoteProbeDraft as o, SyncSshSession as p, SyncRemoteHandshake as r, SyncRemoteProbeHandshake as s, REMOTE_PROBE_BEGIN_MARKER as t, SyncSessionDeltaPrefixError as u };
-//# sourceMappingURL=ssh-transport-C7povM0s.d.ts.map
+//# sourceMappingURL=ssh-transport-BxPWfu9X.d.ts.map

package/lib/{stores-CKyEt0yk.d.ts → stores-puyTC075.d.ts}

@@ -1,5 +1,5 @@
 import { r as SyncRevision } from "./revision-C9sOlDZ6.js";
-import { a as SyncPeer, f as SyncState, o as SyncPeerDraft } from "./model-BP7Gw1yk.js";
+import { a as SyncPeer, f as SyncState, o as SyncPeerDraft } from "./model-CKTBf-Pl.js";
 //#region src/core/sync/stores.d.ts
 declare function getOrCreateSyncInstanceId(home?: string): string;
 declare class SyncPeerStore {
@@ -28,4 +28,4 @@ declare class SyncStateStore {
 }
 //#endregion
 export { SyncStateStore as n, getOrCreateSyncInstanceId as r, SyncPeerStore as t };
-//# sourceMappingURL=stores-CKyEt0yk.d.ts.map
+//# sourceMappingURL=stores-puyTC075.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artenx/dshb",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "Routes DSH filesystem, shell, subprocess, and PTY operations to local, SSH, and Docker execution nodes, with a node registry, an authentication gate, a mobile-aware management UI, and per-workspace custom project instructions.",
   "type": "module",
   "main": "lib/index.js",
@@ -8,7 +8,6 @@
   "exports": {
     ".": "./lib/index.js",
     "./auth": "./lib/auth/index.js",
-    "./auth/startup": "./lib/auth/startup.js",
     "./auth/decorate-webserver": "./lib/auth/decorate-webserver.js",
     "./auth/loopback": "./lib/auth/loopback.js",
     "./auth/loopback-compat": "./lib/auth/loopback-compat.js",
@@ -83,8 +82,8 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "lib",
-    "cordis.patch.yml"
+    "cordis.patch.yml",
+    "lib"
   ],
   "dsh": {
     "bundle": {
@@ -180,5 +179,8 @@
   "homepage": "https://github.com/Artenx/dsh-honeybee#readme",
   "bugs": {
     "url": "https://github.com/Artenx/dsh-honeybee/issues"
+  },
+  "bin": {
+    "dshb-auth-reset": "./lib/auth/reset-cli.js"
   }
 }

package/lib/auth/startup.d.ts

@@ -1,15 +0,0 @@
-import { Context } from "@deepseek-ai/cordis";
-//#region src/auth/startup.d.ts
-declare const name = "web-startup";
-declare const inject: string[];
-declare const WEB_STARTUP_SERVICE = "webStartup";
-interface WebStartupValues {
-  openBrowser: boolean;
-  host?: string;
-  port?: number;
-  trustedHosts: string[];
-}
-declare function apply(ctx: Context): void;
-//#endregion
-export { WEB_STARTUP_SERVICE, WebStartupValues, apply, inject, name };
-//# sourceMappingURL=startup.d.ts.map

package/lib/auth/startup.js

@@ -1,68 +0,0 @@
-import { sanitizeUsername, sharedCredentialStore } from "./credentials.js";
-import { Command } from "commander";
-import { parseCmdline } from "@deepseek-ai/dsh-cmdline";
-//#region src/auth/startup.ts
-const name = "web-startup";
-const inject = ["cmdlineArgs"];
-const WEB_STARTUP_SERVICE = "webStartup";
-function runAuthReset(args) {
-	const store = sharedCredentialStore();
-	if (!store.isInitialized()) {
-		console.error("auth-reset: 尚未初始化管理员账号");
-		process.exit(1);
-	}
-	let password;
-	let username;
-	for (let i = 1; i < args.length; i++) if (args[i] === "--password") password = args[++i];
-	else if (args[i] === "--username") username = args[++i];
-	if (password === void 0 && username === void 0) {
-		console.error("auth-reset: 需要 --password <新密码> 和/或 --username <新用户名>");
-		process.exit(1);
-	}
-	if (password !== void 0 && password.length < 8) {
-		console.error("auth-reset: 密码至少 8 个字符");
-		process.exit(1);
-	}
-	if (username !== void 0) {
-		username = sanitizeUsername(username);
-		if (!username) {
-			console.error("auth-reset: 用户名不能为空");
-			process.exit(1);
-		}
-	}
-	if (password !== void 0) store.changePassword(username ?? store.username, password);
-	else store.changeUsername(username);
-	console.log("auth-reset: 已更新凭据并轮换会话密钥，全部已签发会话作废");
-	process.exit(0);
-}
-function webCommand() {
-	return new Command().name("dsh --profile web").description("Serve the DeepSeek Harness UI.").helpOption("-h, --help", "show this help").option("--host <host>", "bind host").option("--no-open", "do not open the UI in the default browser").option("--port <port>", "listen port; pass 0 to let the OS pick a free one").option("--trusted-host <authority...>", "extra authority the /api browser-trust fence accepts (host or host:port; repeatable)").addHelpText("after", `
-Examples:
-  dsh --profile web                          serve on the composed host and port
-  dsh --profile web --no-open                serve without opening a browser (desktop app ignores this)
-  dsh --profile web --port 8080              serve on another port
-  dsh --profile web --host 0.0.0.0           serve on all interfaces (DSHB: auth plugin guards access)
-  dsh --profile web auth-reset --password <新密码>   reset admin credentials and revoke all sessions
-`);
-}
-function apply(ctx) {
-	const args = ctx.cmdlineArgs?.get() ?? [];
-	if (args[0] === "auth-reset") runAuthReset(args);
-	const program = webCommand();
-	program.action(() => {
-		const options = program.opts();
-		if (options.port !== void 0 && !/^\d+$/.test(options.port)) program.error(`error: --port must be a number, got ${JSON.stringify(options.port)}`);
-		const values = {
-			openBrowser: options.open,
-			...options.host !== void 0 && { host: options.host },
-			...options.port !== void 0 && { port: Number(options.port) },
-			trustedHosts: options.trustedHost ?? []
-		};
-		ctx.provide(WEB_STARTUP_SERVICE, values);
-	});
-	parseCmdline(ctx, program);
-}
-//#endregion
-export { WEB_STARTUP_SERVICE, apply, inject, name };
-
-//# sourceMappingURL=startup.js.map

package/lib/auth/startup.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"startup.js","names":[],"sources":["../../src/auth/startup.ts"],"sourcesContent":["import { Command } from 'commander'\nimport { parseCmdline } from '@deepseek-ai/dsh-cmdline'\nimport type { Context } from '@deepseek-ai/cordis'\nimport { sanitizeUsername, sharedCredentialStore } from './credentials.js'\n\nexport const name = 'web-startup'\n\nexport const inject = ['cmdlineArgs']\n\nexport const WEB_STARTUP_SERVICE = 'webStartup'\n\nexport interface WebStartupValues {\n  openBrowser: boolean\n  host?: string\n  port?: number\n  trustedHosts: string[]\n}\n\nfunction runAuthReset(args: readonly string[]): never {\n  const store = sharedCredentialStore()\n  if (!store.isInitialized()) {\n    console.error('auth-reset: 尚未初始化管理员账号')\n    process.exit(1)\n  }\n  let password: string | undefined\n  let username: string | undefined\n  for (let i = 1; i < args.length; i++) {\n    if (args[i] === '--password') password = args[++i]\n    else if (args[i] === '--username') username = args[++i]\n  }\n  if (password === undefined && username === undefined) {\n    console.error('auth-reset: 需要 --password <新密码> 和/或 --username <新用户名>')\n    process.exit(1)\n  }\n  if (password !== undefined && password.length < 8) {\n    console.error('auth-reset: 密码至少 8 个字符')\n    process.exit(1)\n  }\n  if (username !== undefined) {\n    username = sanitizeUsername(username)\n    if (!username) {\n      console.error('auth-reset: 用户名不能为空')\n      process.exit(1)\n    }\n  }\n  if (password !== undefined) store.changePassword(username ?? store.username!, password)\n  else store.changeUsername(username!)\n  console.log('auth-reset: 已更新凭据并轮换会话密钥，全部已签发会话作废')\n  process.exit(0)\n}\n\nfunction webCommand(): Command {\n  return new Command()\n    .name('dsh --profile web')\n    .description('Serve the DeepSeek Harness UI.')\n    .helpOption('-h, --help', 'show this help')\n    .option('--host <host>', 'bind host')\n    .option('--no-open', 'do not open the UI in the default browser')\n    .option('--port <port>', 'listen port; pass 0 to let the OS pick a free one')\n    .option(\n      '--trusted-host <authority...>',\n      'extra authority the /api browser-trust fence accepts (host or host:port; repeatable)',\n    )\n    .addHelpText(\n      'after',\n      `\nExamples:\n  dsh --profile web                          serve on the composed host and port\n  dsh --profile web --no-open                serve without opening a browser (desktop app ignores this)\n  dsh --profile web --port 8080              serve on another port\n  dsh --profile web --host 0.0.0.0           serve on all interfaces (DSHB: auth plugin guards access)\n  dsh --profile web auth-reset --password <新密码>   reset admin credentials and revoke all sessions\n`,\n    )\n}\n\nexport function apply(ctx: Context): void {\n  const args = ctx.cmdlineArgs?.get() ?? []\n  if (args[0] === 'auth-reset') runAuthReset(args)\n  const program = webCommand()\n  program.action(() => {\n    const options = program.opts()\n    if (options.port !== undefined && !/^\\d+$/.test(options.port)) {\n      program.error(`error: --port must be a number, got ${JSON.stringify(options.port)}`)\n    }\n    const values: WebStartupValues = {\n      openBrowser: options.open,\n      ...(options.host !== undefined && { host: options.host }),\n      ...(options.port !== undefined && { port: Number(options.port) }),\n      trustedHosts: options.trustedHost ?? [],\n    }\n    ctx.provide(WEB_STARTUP_SERVICE, values)\n  })\n  parseCmdline(ctx, program)\n}\n"],"mappings":";;;;AAKA,MAAa,OAAO;AAEpB,MAAa,SAAS,CAAC,aAAa;AAEpC,MAAa,sBAAsB;AASnC,SAAS,aAAa,MAAgC;CACpD,MAAM,QAAQ,sBAAsB;CACpC,IAAI,CAAC,MAAM,cAAc,GAAG;EAC1B,QAAQ,MAAM,wBAAwB;EACtC,QAAQ,KAAK,CAAC;CAChB;CACA,IAAI;CACJ,IAAI;CACJ,KAAK,IAAI,IAAI,GAAG,IAAI,KAAK,QAAQ,KAC/B,IAAI,KAAK,OAAO,cAAc,WAAW,KAAK,EAAE;MAC3C,IAAI,KAAK,OAAO,cAAc,WAAW,KAAK,EAAE;CAEvD,IAAI,aAAa,KAAA,KAAa,aAAa,KAAA,GAAW;EACpD,QAAQ,MAAM,uDAAuD;EACrE,QAAQ,KAAK,CAAC;CAChB;CACA,IAAI,aAAa,KAAA,KAAa,SAAS,SAAS,GAAG;EACjD,QAAQ,MAAM,wBAAwB;EACtC,QAAQ,KAAK,CAAC;CAChB;CACA,IAAI,aAAa,KAAA,GAAW;EAC1B,WAAW,iBAAiB,QAAQ;EACpC,IAAI,CAAC,UAAU;GACb,QAAQ,MAAM,qBAAqB;GACnC,QAAQ,KAAK,CAAC;EAChB;CACF;CACA,IAAI,aAAa,KAAA,GAAW,MAAM,eAAe,YAAY,MAAM,UAAW,QAAQ;MACjF,MAAM,eAAe,QAAS;CACnC,QAAQ,IAAI,oCAAoC;CAChD,QAAQ,KAAK,CAAC;AAChB;AAEA,SAAS,aAAsB;CAC7B,OAAO,IAAI,QAAQ,CAAC,CACjB,KAAK,mBAAmB,CAAC,CACzB,YAAY,gCAAgC,CAAC,CAC7C,WAAW,cAAc,gBAAgB,CAAC,CAC1C,OAAO,iBAAiB,WAAW,CAAC,CACpC,OAAO,aAAa,2CAA2C,CAAC,CAChE,OAAO,iBAAiB,mDAAmD,CAAC,CAC5E,OACC,iCACA,sFACF,CAAC,CACA,YACC,SACA;;;;;;;CAQF;AACJ;AAEA,SAAgB,MAAM,KAAoB;CACxC,MAAM,OAAO,IAAI,aAAa,IAAI,KAAK,CAAC;CACxC,IAAI,KAAK,OAAO,cAAc,aAAa,IAAI;CAC/C,MAAM,UAAU,WAAW;CAC3B,QAAQ,aAAa;EACnB,MAAM,UAAU,QAAQ,KAAK;EAC7B,IAAI,QAAQ,SAAS,KAAA,KAAa,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAC1D,QAAQ,MAAM,uCAAuC,KAAK,UAAU,QAAQ,IAAI,GAAG;EAErF,MAAM,SAA2B;GAC/B,aAAa,QAAQ;GACrB,GAAI,QAAQ,SAAS,KAAA,KAAa,EAAE,MAAM,QAAQ,KAAK;GACvD,GAAI,QAAQ,SAAS,KAAA,KAAa,EAAE,MAAM,OAAO,QAAQ,IAAI,EAAE;GAC/D,cAAc,QAAQ,eAAe,CAAC;EACxC;EACA,IAAI,QAAQ,qBAAqB,MAAM;CACzC,CAAC;CACD,aAAa,KAAK,OAAO;AAC3B"}