@awiki/dsh-plugin 0.3.2 → 0.3.3

package/lib/index.js

@@ -1,7 +1,8 @@
-import { n as downloadedAttachment } from "./sdk-adapter-C0gdpg1u.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.",
@@ -2293,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");
@@ -2329,6 +2369,10 @@ function resolveConfig(config) {
 		attachmentMaxBytes,
 		imageAttachmentCacheMaxBytes,
 		pollIntervalMs,
+		...profileName === void 0 ? {} : {
+			profileName,
+			legacySharedStateDetected
+		},
 		listenerEnabled,
 		listener: {
 			allowedPeers,
@@ -3273,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);
@@ -3381,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
+					}
 				}
 			});
 		}

package/lib/provider.js

@@ -1,4 +1,4 @@
-import { t as RustSdkAdapter } from "./sdk-adapter-C0gdpg1u.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-C0gdpg1u.mjs → sdk-adapter-CDLTgHJA.mjs}

@@ -20,7 +20,7 @@ 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",