@awiki/dsh-plugin 0.3.1 → 0.3.3

package/lib/index.js

@@ -1,7 +1,8 @@
-import { n as downloadedAttachment } from "./sdk-adapter-BIbsJmRj.mjs";
+import { n as downloadedAttachment } from "./sdk-adapter-CDLTgHJA.mjs";
 import "@deepseek-ai/cordis";
+import { existsSync } from "node:fs";
 import { homedir } from "node:os";
-import { isAbsolute, join } from "node:path";
+import { basename, dirname, isAbsolute, join, resolve } from "node:path";
 import z from "@deepseek-ai/schemastery";
 import { Remote, TypertRemoteService } from "@deepseek-ai/dsh-typert-protocol";
 import { SettingsConflictError, settingsNamespace } from "@deepseek-ai/dsh-settings";
@@ -11,6 +12,7 @@ import { createHash, randomUUID } from "node:crypto";
 import { installModelSelection } from "@deepseek-ai/dsh-agent";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
 import { SessionId } from "@deepseek-ai/dsh-session";
+import { fileURLToPath } from "node:url";
 //#region lib/types/types.js
 /** Client-safe AWiki service and Remote data types. */
 /** Exact browser acknowledgement required before locally signing out. */
@@ -2092,6 +2094,40 @@ var AwikiAgentListener = class {
 	}
 };
 //#endregion
+//#region lib/types/profile-state.js
+/** Match the profile-name boundary enforced by the DSH launcher. */
+function assertProfileName(value, source) {
+	if (typeof value !== "string" || value.length === 0 || value.includes("/") || value.includes("\\") || value === "." || value === ".." || value === "node_modules") throw new TypeError(`awiki: ${source} supplied an invalid profile name`);
+	return value;
+}
+/**
+* Resolve the active DSH profile without guessing it from argv or process type.
+* Desktop's generation-scoped service is authoritative. Ordinary DSH has no
+* corresponding service, so its Loader root is accepted only when it is the
+* exact `$DSH_HOME/profiles/<name>` directory.
+*/
+function resolveAwikiProfileName(ctx, dshHome) {
+	const desktopProfiles = ctx.get("desktopProfiles");
+	if (desktopProfiles !== void 0) return assertProfileName(desktopProfiles.current?.name, "desktopProfiles.current");
+	let profileDir;
+	try {
+		if (ctx.baseUrl === void 0) return void 0;
+		const baseUrl = new URL(ctx.baseUrl);
+		if (baseUrl.protocol !== "file:") return void 0;
+		profileDir = resolve(fileURLToPath(baseUrl));
+	} catch {
+		return;
+	}
+	const profilesDir = resolve(dshHome, "profiles");
+	if (dirname(profileDir) !== profilesDir) return void 0;
+	return assertProfileName(basename(profileDir), "Loader profile directory");
+}
+/** Resolve the profile-local default while preserving the legacy fallback. */
+function resolveAwikiStateRoot(ctx, dshHome) {
+	const profileName = resolveAwikiProfileName(ctx, dshHome);
+	return profileName === void 0 ? join(dshHome, "awiki", "im-core") : join(dshHome, "awiki", profileName, "im-core");
+}
+//#endregion
 //#region lib/types/index.js
 /** Unified AWiki identity, messaging, attachment, Remote, and model-tool service. */
 var __runInitializers = function(thisArg, initializers, value) {
@@ -2179,6 +2215,7 @@ const FAILURE_CODES = /* @__PURE__ */ new Set([
 	"forbidden",
 	"identity-recovery-required",
 	"conflict",
+	"state-in-use",
 	"rate-limited",
 	"group-membership-required",
 	"group-identity-stale",
@@ -2208,6 +2245,7 @@ const FAILURE_MESSAGES = {
 	"forbidden": "The AWiki operation is not permitted.",
 	"identity-recovery-required": "The local AWiki identity must be recovered before it can be used again.",
 	"conflict": "The AWiki operation conflicts with current state.",
+	"state-in-use": "AWiki data is already open in another client.",
 	"rate-limited": "The AWiki service rate-limited the request.",
 	"group-membership-required": "The active AWiki identity is not a member of this group.",
 	"group-identity-stale": "The AWiki group identity binding is still recovering.",
@@ -2236,6 +2274,30 @@ function serviceUrl(field, raw, allowInsecureLoopbackForTesting) {
 	if (url.username !== "" || url.password !== "" || url.hash !== "") throw new TypeError(`awiki: ${field} must not contain credentials or a URL fragment`);
 	return raw;
 }
+/** Resolve the only supported post-recovery endpoint without accepting URL-carried state. */
+function recoveryReconciliationEndpoint(target, allowInsecureLoopbackForTesting) {
+	if (target?.kind !== "model-proxy-v1" || typeof target.baseURL !== "string") throw new TypeError("awiki: recovery reconciliation target is invalid");
+	const baseURL = serviceUrl("recoveryReconciliationTarget.baseURL", target.baseURL, allowInsecureLoopbackForTesting);
+	const parsed = new URL(baseURL);
+	if (parsed.search !== "") throw new TypeError("awiki: recovery reconciliation target must not contain a query");
+	return new URL("/api/identity-recovery", parsed).toString();
+}
+/** Accept only the closed Model Proxy success response; no ledger identifier may cross back. */
+async function acceptsRecoveryReconciliation(response) {
+	if (!response.ok) return false;
+	let value;
+	try {
+		const text = await readBoundedResponseText(response, RECOVERY_RECONCILIATION_RESPONSE_MAX_BYTES);
+		if (text === void 0) return false;
+		value = JSON.parse(text);
+	} catch {
+		return false;
+	}
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+	const result = value;
+	const keys = Object.keys(result).sort();
+	return keys.length === 2 && keys[0] === "idempotent" && keys[1] === "restored" && result.restored === true && typeof result.idempotent === "boolean";
+}
 /** Validate a provider domain without inferring it from an API endpoint. */
 function serviceDomain(raw, field = "userServiceDomain") {
 	return normalizeAwikiDomain(raw, field);
@@ -2269,12 +2331,14 @@ function listenerAllowedPeers(raw, enabled) {
 	return peers;
 }
 /** Resolve and validate every deployment choice before publishing the service. */
-function resolveConfig(config) {
+function resolveConfig(ctx, config) {
 	const allowInsecureLoopbackForTesting = config.allowInsecureLoopbackForTesting ?? false;
 	const configuredStateRoot = config.stateRoot?.trim();
 	const configuredDshHome = process.env.DSH_HOME?.trim();
 	const dshHome = configuredDshHome === void 0 || configuredDshHome.length === 0 ? join(homedir(), ".dsh") : configuredDshHome;
-	const stateRoot = configuredStateRoot === void 0 || configuredStateRoot.length === 0 ? join(dshHome, "awiki", "im-core") : configuredStateRoot;
+	const profileName = configuredStateRoot === void 0 || configuredStateRoot.length === 0 ? resolveAwikiProfileName(ctx, dshHome) : void 0;
+	const stateRoot = configuredStateRoot === void 0 || configuredStateRoot.length === 0 ? resolveAwikiStateRoot(ctx, dshHome) : configuredStateRoot;
+	const legacySharedStateDetected = profileName !== void 0 && existsSync(join(dshHome, "awiki", "im-core"));
 	if (!isAbsolute(stateRoot)) throw new TypeError("awiki: stateRoot must be an absolute path");
 	const attachmentMaxBytes = config.attachmentMaxBytes ?? 10485760;
 	if (!Number.isSafeInteger(attachmentMaxBytes) || attachmentMaxBytes < 1) throw new TypeError("awiki: attachmentMaxBytes must be a positive safe integer");
@@ -2305,6 +2369,10 @@ function resolveConfig(config) {
 		attachmentMaxBytes,
 		imageAttachmentCacheMaxBytes,
 		pollIntervalMs,
+		...profileName === void 0 ? {} : {
+			profileName,
+			legacySharedStateDetected
+		},
 		listenerEnabled,
 		listener: {
 			allowedPeers,
@@ -2455,6 +2523,7 @@ function normalizeRecoveryPrepareRequest(request) {
 	};
 }
 const IDENTITY_ACCESS_RESPONSE_MAX_BYTES = 65536;
+const RECOVERY_RECONCILIATION_RESPONSE_MAX_BYTES = 4096;
 /** Read one untrusted discovery response without buffering beyond the fixed Host limit. */
 async function readBoundedResponseText(response, maxBytes) {
 	const declaredLength = response.headers.get("content-length");
@@ -3236,6 +3305,7 @@ let AwikiService = (() => {
 		activeIdentityDid;
 		activeSummaryRequests = /* @__PURE__ */ new Set();
 		summaryProvider;
+		recoveryReconciliationTarget;
 		hostContext;
 		/** Trusted same-process external HTTP authentication dispatcher. Never Remote. */
 		externalHttpAuth;
@@ -3247,7 +3317,7 @@ let AwikiService = (() => {
 		constructor(ctx, config) {
 			super(ctx, "awiki");
 			this.hostContext = ctx;
-			this.resolved = resolveConfig(config);
+			this.resolved = resolveConfig(ctx, config);
 			this.externalHttpAuth = createAwikiExternalHttpAuth(() => this.acquireExternalHttpAuthSession());
 			this.sessionStore = new AwikiSessionStore(this.resolved.stateRoot);
 			this.imageAttachmentCache = new AwikiImageAttachmentCache(this.resolved.stateRoot, this.resolved.attachmentMaxBytes, this.resolved.imageAttachmentCacheMaxBytes);
@@ -3323,6 +3393,18 @@ let AwikiService = (() => {
 			this.startListener(provider);
 			return () => this.disposeProvider(provider);
 		}
+		/** Register the optional Model Proxy recovery target without exposing an arbitrary callback or token. */
+		registerRecoveryReconciliationTarget(target) {
+			if (this.recoveryReconciliationTarget !== void 0) throw new Error("awiki: a recovery reconciliation target is already registered");
+			const registered = Object.freeze({ endpoint: recoveryReconciliationEndpoint(target, this.resolved.allowInsecureLoopbackForTesting) });
+			this.recoveryReconciliationTarget = registered;
+			let active = true;
+			return () => {
+				if (!active) return;
+				active = false;
+				if (this.recoveryReconciliationTarget === registered) this.recoveryReconciliationTarget = void 0;
+			};
+		}
 		/** Register one replaceable conversation-summary provider for this deployment. */
 		registerSummaryProvider(provider) {
 			if (this.summaryProvider !== void 0) throw new Error("awiki: a summary provider is already registered");
@@ -3343,7 +3425,11 @@ let AwikiService = (() => {
 				ok: true,
 				value: {
 					pollIntervalMs: this.resolved.pollIntervalMs,
-					attachmentMaxBytes: this.resolved.attachmentMaxBytes
+					attachmentMaxBytes: this.resolved.attachmentMaxBytes,
+					...this.resolved.profileName === void 0 ? {} : {
+						profileName: this.resolved.profileName,
+						legacySharedStateDetected: this.resolved.legacySharedStateDetected
+					}
 				}
 			});
 		}
@@ -4112,24 +4198,58 @@ let AwikiService = (() => {
 				try {
 					const identity = await provider.client.getIdentity();
 					if (identity === null || identity.did !== progress.currentDid) return false;
-					if (this.signedOut === false && this.activeIdentityDid === identity.did) return true;
-					await this.sessionStore.signIn();
-					this.signedOut = false;
-					this.activeIdentityDid = identity.did;
-					this.invalidateSummaries();
-					const session = {
-						status: "active",
-						identity
-					};
-					this.publishSession(session);
-					await provider.listenerStartup;
-					await this.startListener(provider);
-					return true;
+					const alreadyActive = this.signedOut === false && this.activeIdentityDid === identity.did;
+					if (!alreadyActive) {
+						await this.sessionStore.signIn();
+						this.signedOut = false;
+						this.activeIdentityDid = identity.did;
+						this.invalidateSummaries();
+					}
+					const reconciled = await this.reconcileRecoveredIdentity(provider, progress.operationId);
+					if (this.provider !== provider) return false;
+					if (!alreadyActive) {
+						const session = {
+							status: "active",
+							identity
+						};
+						this.publishSession(session);
+						await provider.listenerStartup;
+						await this.startListener(provider);
+					}
+					return reconciled;
 				} catch {
 					return false;
 				}
 			});
 		}
+		/** Rebind Mail first-use ownership and, when installed, the canonical model billing account. */
+		async reconcileRecoveredIdentity(provider, operationId) {
+			const logger = this.ctx.logger("awiki-recovery");
+			let mailboxRestored = false;
+			try {
+				await provider.client.getMailAccount();
+				mailboxRestored = true;
+			} catch {
+				logger.warn("awiki: recovered mailbox reconciliation is pending");
+			}
+			const target = this.recoveryReconciliationTarget;
+			if (target === void 0) return mailboxRestored;
+			try {
+				const authority = await provider.client.issueRecoveryAttestation({ operationId });
+				if (!await acceptsRecoveryReconciliation(await this.externalHttpAuth.dispatch(new Request(target.endpoint, {
+					method: "POST",
+					headers: { "content-type": "application/json" },
+					body: JSON.stringify({ attestation: authority.attestation })
+				}), (request) => fetch(request)))) {
+					logger.warn("awiki: recovered model account reconciliation is pending");
+					return false;
+				}
+				return mailboxRestored;
+			} catch {
+				logger.warn("awiki: recovered model account reconciliation is pending");
+				return false;
+			}
+		}
 		/** Publish one newly registered identity and start its listener through the existing session path. */
 		async activateRegisteredIdentity(identity) {
 			this.activeIdentityDid = identity.did;

package/lib/provider.js

@@ -1,4 +1,4 @@
-import { t as RustSdkAdapter } from "./sdk-adapter-BIbsJmRj.mjs";
+import { t as RustSdkAdapter } from "./sdk-adapter-CDLTgHJA.mjs";
 import { openImCoreNodeClient } from "@awiki/im-core-node";
 //#region lib/types/provider.js
 /** Production AWiki provider backed by the versioned Rust IM Core Node bridge. */

package/lib/{sdk-adapter-BIbsJmRj.mjs → sdk-adapter-CDLTgHJA.mjs}

@@ -20,13 +20,15 @@ const RUST_FAILURE_CODES = {
 	auth_revoked: "identity-recovery-required",
 	conflict: "conflict",
 	join_required: "handle-unavailable",
-	state_in_use: "conflict",
+	state_in_use: "state-in-use",
 	rate_limited: "rate-limited",
 	timeout: "network",
 	transport_unavailable: "network",
 	sync_failed: "network",
 	session_expired: "network",
-	attachment_transfer_network: "network"
+	attachment_transfer_network: "network",
+	recovery_reconciliation_unavailable: "network",
+	recovery_reconciliation_invalid: "conflict"
 };
 /** Closed provider error consumed by the Host's fixed public failure mapping. */
 var AwikiSdkError = class extends Error {
@@ -642,6 +644,15 @@ var RustSdkAdapter = class {
 	resumeRecovery(request) {
 		return this.run(async (client) => this.recoveryProgress(await client.resumeHandleRecovery(request)));
 	}
+	issueRecoveryAttestation(request) {
+		return this.run(async (client) => {
+			const value = await client.issueHandleRecoveryAttestation(request);
+			return {
+				attestation: required(value.attestation),
+				expiresAt: required(value.expiresAt)
+			};
+		});
+	}
 	discardRecovery(request) {
 		return this.run(async (client) => {
 			await client.discardHandleRecovery(request);