@khorsheed/dsh-local-agent-dsh 0.2.0-rc.1 → 0.2.0

package/lib/dsh-cli-provider.js

@@ -1,3 +1,3 @@
+import { a as MEMBER_BRIDGE_ENTRY_ENV, c as dshTextTask, d as startDshCliRun, i as DshCliProvider, l as registerMemberRun, n as DEFAULT_DISPOSE_GRACE_MS, o as dshCliVersion, r as DEFAULT_LIVE_MIRROR_INTERVAL_MS, s as dshLaunchArgv, t as CONTAINER_NODE_OPTIONS, u as resolveApiKey } from "./dsh-cli-provider-DYRuRpVz.js";
 import "./provision.js";
-import { a as MEMBER_BRIDGE_ENTRY_ENV, c as dshTextTask, d as startDshCliRun, i as DshCliProvider, l as registerMemberRun, n as DEFAULT_DISPOSE_GRACE_MS, o as dshCliVersion, r as DEFAULT_LIVE_MIRROR_INTERVAL_MS, s as dshLaunchArgv, t as CONTAINER_NODE_OPTIONS, u as resolveApiKey } from "./dsh-cli-provider-UhWvivte.js";
 export { CONTAINER_NODE_OPTIONS, DEFAULT_DISPOSE_GRACE_MS, DEFAULT_LIVE_MIRROR_INTERVAL_MS, DshCliProvider, MEMBER_BRIDGE_ENTRY_ENV, dshCliVersion, dshLaunchArgv, dshTextTask, registerMemberRun, resolveApiKey, startDshCliRun };

package/lib/index.js

@@ -1,9 +1,9 @@
-import { DEFAULT_SUB_PROFILE_NAME, USER_PRESET_DIR, defaultPresetRoot, provisionDshScope } from "./provision.js";
-import { f as DEFAULT_LIVE_IDLE_MS, i as DshCliProvider, o as dshCliVersion, p as DshLiveDriver, t as CONTAINER_NODE_OPTIONS } from "./dsh-cli-provider-UhWvivte.js";
+import { f as DEFAULT_LIVE_IDLE_MS, h as localModelLaunch, i as DshCliProvider, m as canInheritModelProvider, o as dshCliVersion, p as DshLiveDriver, t as CONTAINER_NODE_OPTIONS } from "./dsh-cli-provider-DYRuRpVz.js";
+import { DEFAULT_SUB_PROFILE_NAME, provisionDshScope } from "./provision.js";
 import { listDshSessions } from "./records.js";
-import { join } from "node:path";
+import { dirname } from "node:path";
+import { fileURLToPath } from "node:url";
 import z from "@deepseek-ai/schemastery";
-import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { ModelDirectoryCache, extendModelDirectory, settingsFace, vol } from "@khorsheed/dsh-local-agent";
 import { mountSubagentDelegationTool } from "@khorsheed/dsh-local-agent/tool-factory";
 //#region lib/types/live-switch.js
@@ -156,7 +156,8 @@ var DshModelCatalog = class {
 			unsupported: true,
 			reason: "The host exposes no adapter model directory"
 		};
-		const providers = llm.listProviders();
+		const allProviders = llm.listProviders();
+		const providers = allProviders.filter((provider) => this.deps.canInheritProvider?.(provider.id) ?? true);
 		const groups = await Promise.allSettled(providers.map(async (provider) => Promise.all((await llm.listModels(provider.id)).map(async (model) => {
 			let resolved;
 			try {
@@ -182,12 +183,13 @@ var DshModelCatalog = class {
 		if (failed > 0 && failed === groups.length) throw new Error("DSH adapters could not list models");
 		const entries = groups.flatMap((group) => group.status === "fulfilled" ? group.value : []);
 		const defaultModel = this.deps.defaultModel();
+		const omitted = allProviders.length - providers.length;
 		return {
 			entries,
-			complete: failed === 0,
+			complete: failed === 0 && providers.length === allProviders.length,
 			customInput: true,
-			...defaultModel === void 0 ? {} : { defaultModel },
-			...failed === 0 ? {} : { reason: `${failed} adapter model list(s) unavailable` }
+			...defaultModel === void 0 || !entries.some((entry) => entry.value === defaultModel) ? {} : { defaultModel },
+			...failed === 0 && omitted === 0 ? {} : { reason: [...failed === 0 ? [] : [`${failed} adapter model list(s) unavailable`], ...omitted === 0 ? [] : [`${omitted} provider(s) do not support local API-key inheritance`]].join("; ") }
 		};
 	}
 };
@@ -356,7 +358,7 @@ var DshModelBroker = class {
 * namespace (default off); while ON, the controller registers the `dsh`
 * harness into the core registry (scoped home under the shared homes root,
 * `$DSH_HOME`), the `dsh-cli` delegation provider (sub-dsh headless runs with
-* the parent's resolved DeepSeek key), and the family delegation tool for it.
+* the parent's selected API-key model route), and the family delegation tool for it.
 * While OFF — the default — nothing model-visible mounts, so the instance
 * keeps exactly the current behavior (official in-process subagent tools) and
 * the model never sees two overlapping delegation tools at once.
@@ -413,9 +415,10 @@ function volatilize(field) {
 }
 const Config = z.object({
 	profileName: z.string().default(DEFAULT_SUB_PROFILE_NAME),
-	apiKeyRef: z.string().default("DEEPSEEK_API_KEY"),
+	apiKeyRef: z.string(),
 	cliLaunch: z.array(z.string()),
 	headlessBundleDir: z.string(),
+	unitHeadlessBundleDir: z.string(),
 	permissions: z.union([
 		z.const("read-only"),
 		z.const("workspace-write"),
@@ -448,8 +451,8 @@ const DSH_TOOL_NAME = "subagent_dsh";
 /**
 * This package's own name, passed to the family tool factory as the
 * tool-origin owner (AGENTS.md § Tool origin tagging — a shared factory never
-* hardcodes an owner). Duplicated from src/invariant.ts, the same pattern the
-* worktrees/room `./tool` entries use.
+* hardcodes an owner), the same pattern the worktrees/room `./tool` entries
+* use.
 */
 const PACKAGE_NAME = "@khorsheed/dsh-local-agent-dsh";
 /**
@@ -471,10 +474,6 @@ const dshSubagentTool = {
 		}, PACKAGE_NAME);
 	}
 };
-/** Resolve the sub-dsh credential or report unconfigured. */
-async function resolveApiKey(ctx, config) {
-	return ctx.credentials.resolve(credentialRef(config.apiKeyRef ?? "DEEPSEEK_API_KEY"));
-}
 /**
 * Mount the toggle controller: register the settings namespace, then mirror
 * its value into harness/provider/tool registrations, live.
@@ -519,7 +518,8 @@ function apply(ctx, config) {
 		};
 		const modelCatalog = new DshModelCatalog({
 			llm: () => ctx.get("llm"),
-			defaultModel: hostDefaultModel
+			defaultModel: hostDefaultModel,
+			canInheritProvider: (provider) => canInheritModelProvider(ctx, provider)
 		});
 		modelCatalog.read();
 		ctx.on("llm/adapters-updated", () => {
@@ -541,14 +541,26 @@ function apply(ctx, config) {
 			retireRuntime: (childSessionId) => currentLiveSwitch?.retireRuntime(childSessionId) ?? Promise.resolve()
 		});
 		/**
-		* This deployment's preset root — where a person or a pack installed the
-		* presets this instance offers, and the SOURCE every scope's own copy is
-		* taken from. Derived the way the roster derives it, from the settings
-		* service's harness home when there is one.
+		* This instance's own profile directory — the loader's `baseUrl`, which
+		* the host sets to the directory holding the profile's `cordis.yml`. Its
+		* direct dependencies are where an installed preset package is found, and
+		* the SOURCE every scope's own copy is taken from (the same package this
+		* instance's capability catalog measures). Undefined when the loader
+		* exposes no file URL, which leaves a scope able to keep the copy it has
+		* but unable to take a new one.
 		*/
-		const instancePresetRoot = () => {
-			const home = ctx.get?.("settings")?.home;
-			return home === void 0 ? defaultPresetRoot() : join(home, USER_PRESET_DIR);
+		const instanceProfileDir = () => {
+			const baseUrl = ctx.baseUrl;
+			if (typeof baseUrl !== "string" || !baseUrl.startsWith("file:")) return void 0;
+			try {
+				return dirname(fileURLToPath(new URL("./package.json", baseUrl)));
+			} catch {
+				return;
+			}
+		};
+		const profileDirOption = () => {
+			const dir = instanceProfileDir();
+			return dir === void 0 ? {} : { instanceProfileDir: dir };
 		};
 		const harness = {
 			prepareMember: async ({ binding, childSession, configuration, signal }) => {
@@ -572,7 +584,7 @@ function apply(ctx, config) {
 			provision: (scopedHome, options) => {
 				const provisioned = provisionDshScope(scopedHome, config, {
 					...options?.preset === void 0 ? {} : { preset: options.preset },
-					presetRoot: instancePresetRoot()
+					...profileDirOption()
 				});
 				return {
 					...provisioned.preset === void 0 ? {} : { preset: provisioned.preset },
@@ -581,7 +593,8 @@ function apply(ctx, config) {
 			},
 			isAuthenticated: async () => {
 				try {
-					return await resolveApiKey(ctx, config) !== void 0;
+					await localModelLaunch(ctx, config, resolveModel() ?? hostDefaultModel());
+					return true;
 				} catch {
 					return false;
 				}
@@ -610,7 +623,7 @@ function apply(ctx, config) {
 			const gen = generation;
 			for (const dispose of disposers.splice(0)) dispose();
 			if (!enabled) return;
-			provisionDshScope(homeDir, config, { presetRoot: instancePresetRoot() });
+			provisionDshScope(homeDir, config, profileDirOption());
 			disposers.push(ctx.localAgent.register(harness));
 			const liveSwitch = new LiveDriverSwitch(ctx, face, config, { modelFor: (childSessionId) => memberModelOverrides.get(childSessionId) ?? resolveModel() });
 			currentLiveSwitch = liveSwitch;