@chatcode/chatcode-cli 3.0.4-rc.1 → 3.0.4-rc.3

package/runtime/node_modules/@deepseek-ai/dsh-agent-default-model/lib/index.js

@@ -1,8 +1,9 @@
 import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
+import { mkdir } from "node:fs/promises";
+import { dirname, join } from "node:path";
 import { Service } from "@deepseek-ai/cordis";
 import z from "@deepseek-ai/schemastery";
-import { writeFileAtomic } from "@deepseek-ai/dsh-atomic-write";
+import { withFileLock, writeFileAtomic } from "@deepseek-ai/dsh-atomic-write";
 import { resolveChatCodeCliHome } from "@deepseek-ai/dsh-home-paths";
 import { ReasoningEffortId } from "@deepseek-ai/dsh-llm";
 //#region lib/types/index.js
@@ -17,12 +18,12 @@ function selection(settings) {
 	};
 }
 /** Parse one product-wide model preference without accepting partial records. */
-function sharedPreference(path) {
+function sharedPreference(path, warn) {
 	try {
 		const parsed = JSON.parse(readFileSync(path, "utf8"));
-		if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) return void 0;
+		if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) throw new Error("expected a model preference object");
 		const record = parsed;
-		if (typeof record.provider !== "string" || record.provider.length === 0 || typeof record.model !== "string" || record.model.length === 0) return void 0;
+		if (typeof record.provider !== "string" || record.provider.length === 0 || typeof record.model !== "string" || record.model.length === 0) throw new Error("expected non-empty provider and model IDs");
 		const route = selection({
 			provider: record.provider,
 			model: record.model,
@@ -33,7 +34,8 @@ function sharedPreference(path) {
 			selection: route,
 			...displayName === "" ? {} : { displayName }
 		};
-	} catch (_error) {
+	} catch (error) {
+		if (error.code !== "ENOENT") warn(`Cannot read model preference at ${path}: ${String(error)}`);
 		return;
 	}
 }
@@ -48,6 +50,9 @@ var AgentDefaultModelConfig = class extends Service {
 	saves = Promise.resolve();
 	sharedPath;
 	shared;
+	displayName;
+	awaitingDefault = false;
+	allowCatalogDefault = false;
 	static Config = z.object({
 		provider: z.string().required().volatile(),
 		model: z.string().required().volatile(),
@@ -58,16 +63,47 @@ var AgentDefaultModelConfig = class extends Service {
 		this.ownerContext = ownerContext;
 		this.config = config;
 		this.sharedPath = process.env[PRODUCT_VERSION_ENV]?.trim() ? join(resolveChatCodeCliHome(), SHARED_MODEL_FILENAME) : void 0;
-		if (this.sharedPath !== void 0) this.shared = sharedPreference(existsSync(this.sharedPath) ? this.sharedPath : join(resolveChatCodeCliHome(), "tui", SHARED_MODEL_FILENAME))?.selection;
+		if (this.sharedPath !== void 0) {
+			const stored = sharedPreference(existsSync(this.sharedPath) ? this.sharedPath : join(resolveChatCodeCliHome(), "tui", SHARED_MODEL_FILENAME), (message) => {
+				ownerContext.logger.warn(message);
+			});
+			const reasoningEffort = config.reasoningEffort.get();
+			this.shared = stored?.selection ?? selection({
+				provider: config.provider.get(),
+				model: config.model.get(),
+				...reasoningEffort === void 0 ? {} : { reasoningEffort }
+			});
+			this.awaitingDefault = stored === void 0 && (this.shared.provider === "" || this.shared.model === "");
+			this.allowCatalogDefault = stored === void 0;
+			this.displayName = stored?.displayName;
+		}
 		ownerContext.inject(["settings"], (child) => {
 			child.effect(() => child.settings.configure({ auto: false }, ownerContext.fiber));
 		});
+		ownerContext.effect(() => () => this.saves);
 	}
 	/**
 	* Read the current default model selection.
+	* A first launch without a valid preference adopts the first complete Config
+	* default when it arrives; that process-local choice then stays cached.
 	* @returns a detached provider, model, and optional reasoning selection.
 	*/
 	currentSelection() {
+		if (this.awaitingDefault) {
+			const provider = this.config.provider.get();
+			const model = this.config.model.get();
+			if (provider === "" || model === "") return {
+				provider: "",
+				model: ""
+			};
+			const reasoningEffort = this.config.reasoningEffort.get();
+			this.shared = selection({
+				provider,
+				model,
+				...reasoningEffort === void 0 ? {} : { reasoningEffort }
+			});
+			this.awaitingDefault = false;
+		}
 		if (this.shared !== void 0) return { ...this.shared };
 		const reasoningEffort = this.config.reasoningEffort.get();
 		return selection({
@@ -76,28 +112,84 @@ var AgentDefaultModelConfig = class extends Service {
 			...reasoningEffort === void 0 ? {} : { reasoningEffort }
 		});
 	}
-	/** Read the latest shared display name without changing this process's model selection.
+	/** Whether this product uses a process-local selection initialized from Home at startup.
+	* @returns true for the integrated ChatCode CLI and Web profiles.
+	*/
+	usesSharedPreference() {
+		return this.sharedPath !== void 0;
+	}
+	/** Resolve the cached route against the live catalog without reading or writing preferences.
+	* A first launch without a valid preference may adopt an advertised fallback
+	* until its first available default is resolved. Saved or initialized choices
+	* never switch implicitly. Catalog errors preserve the candidate for retry.
+	* @returns the exact available selection, an unverified candidate, or an empty provider/model pair.
+	*/
+	async resolveSelection() {
+		const route = this.currentSelection();
+		if (!this.usesSharedPreference()) return route;
+		const llm = this.ctx.get("llm");
+		if (llm === void 0) return route;
+		const cached = this.shared;
+		const providers = llm.listProviders();
+		let routeModels = [];
+		if (providers.some((provider) => provider.id === route.provider)) {
+			try {
+				routeModels = await llm.listModels(route.provider);
+			} catch (_error) {
+				if (this.shared !== cached) return this.resolveSelection();
+				return route;
+			}
+			if (this.shared !== cached) return this.resolveSelection();
+			if (routeModels.some((model) => model.id === route.model)) {
+				this.allowCatalogDefault = false;
+				return route;
+			}
+		}
+		if (!this.allowCatalogDefault) return {
+			provider: "",
+			model: ""
+		};
+		for (const provider of providers) {
+			const models = provider.id === route.provider ? routeModels : await llm.listModels(provider.id).catch(() => []);
+			if (this.shared !== cached) return this.resolveSelection();
+			const model = models[0];
+			if (model === void 0) continue;
+			this.shared = {
+				provider: provider.id,
+				model: model.id
+			};
+			this.awaitingDefault = false;
+			this.allowCatalogDefault = false;
+			return { ...this.shared };
+		}
+		return {
+			provider: "",
+			model: ""
+		};
+	}
+	/** Read this process's cached display name without observing another process's saves.
 	* @returns The saved provider/model/name tuple, or undefined for missing or invalid name metadata.
 	*/
 	sharedDisplayName() {
 		if (this.sharedPath === void 0) return void 0;
-		const stored = sharedPreference(this.sharedPath);
-		if (stored?.displayName === void 0) return void 0;
+		if (this.displayName === void 0) return void 0;
+		const route = this.currentSelection();
 		return {
-			provider: stored.selection.provider,
-			model: stored.selection.model,
-			name: stored.displayName
+			provider: route.provider,
+			model: route.model,
+			name: this.displayName
 		};
 	}
 	/**
 	* Save the complete default model selection to the shared ChatCode Home file,
 	* or the owning profile entry in other deployments. Saves commit in submission
 	* order; a failed save rejects its caller without blocking later saves.
-	* A shared save also retains an available catalog name; metadata failures do not reject the route save.
+	* A shared save uses the caller's already resolved catalog name without an additional lookup.
 	* @param next - resolved selection accepted by an entry point.
+	* @param name - optional display name from the entry point's catalog.
 	* @returns fulfillment after the preference or optional profile write settles.
 	*/
-	async saveSelection(next) {
+	async saveSelection(next, name) {
 		const entry = this.ownerContext.fiber.entry;
 		const editor = this.ctx.get("configEditor");
 		const config = {
@@ -110,20 +202,24 @@ var AgentDefaultModelConfig = class extends Service {
 			if (this.sharedPath !== void 0) {
 				const previous = this.sharedDisplayName();
 				let displayName = previous?.provider === config.provider && previous.model === config.model ? previous.name : void 0;
-				const llm = this.ctx.get("llm");
-				if (llm !== void 0) try {
-					const name = (await llm.listModels(config.provider)).find((model) => model.id === config.model)?.name.trim();
-					if (name !== void 0 && name !== "" && (name !== config.model || displayName === void 0)) displayName = name;
-				} catch (_error) {}
+				if (name?.trim()) displayName = name.trim();
 				const preference = {
 					...config,
 					...displayName === void 0 ? {} : { displayName }
 				};
-				await writeFileAtomic(this.sharedPath, `${JSON.stringify(preference, null, 2)}\n`, {
+				const path = this.sharedPath;
+				await mkdir(dirname(path), {
+					recursive: true,
+					mode: 448
+				});
+				await withFileLock(path, () => writeFileAtomic(path, `${JSON.stringify(preference, null, 2)}\n`, {
 					mode: 384,
 					dirMode: 448
-				});
+				}));
 				this.shared = selection(config);
+				this.displayName = displayName;
+				this.awaitingDefault = false;
+				this.allowCatalogDefault = false;
 			} else if (entry !== void 0 && editor !== void 0) await editor.edit(entry, () => config);
 		});
 		this.saves = saved.catch(() => {});

package/runtime/node_modules/@deepseek-ai/dsh-agent-default-model/lib/types/index.d.ts

@@ -28,6 +28,9 @@ export declare class AgentDefaultModelConfig extends Service {
     private saves;
     private readonly sharedPath;
     private shared;
+    private displayName;
+    private awaitingDefault;
+    private allowCatalogDefault;
     static Config: z<Schemastery.ObjectS<NoInfer<{
         provider: z<string, string, "volatile-defined">;
         model: z<string, string, "volatile-defined">;
@@ -40,10 +43,23 @@ export declare class AgentDefaultModelConfig extends Service {
     constructor(ownerContext: Context, config: Config);
     /**
      * Read the current default model selection.
+     * A first launch without a valid preference adopts the first complete Config
+     * default when it arrives; that process-local choice then stays cached.
      * @returns a detached provider, model, and optional reasoning selection.
      */
     currentSelection(): ModelSelection;
-    /** Read the latest shared display name without changing this process's model selection.
+    /** Whether this product uses a process-local selection initialized from Home at startup.
+     * @returns true for the integrated ChatCode CLI and Web profiles.
+     */
+    usesSharedPreference(): boolean;
+    /** Resolve the cached route against the live catalog without reading or writing preferences.
+     * A first launch without a valid preference may adopt an advertised fallback
+     * until its first available default is resolved. Saved or initialized choices
+     * never switch implicitly. Catalog errors preserve the candidate for retry.
+     * @returns the exact available selection, an unverified candidate, or an empty provider/model pair.
+     */
+    resolveSelection(): Promise<ModelSelection>;
+    /** Read this process's cached display name without observing another process's saves.
      * @returns The saved provider/model/name tuple, or undefined for missing or invalid name metadata.
      */
     sharedDisplayName(): {
@@ -55,11 +71,12 @@ export declare class AgentDefaultModelConfig extends Service {
      * Save the complete default model selection to the shared ChatCode Home file,
      * or the owning profile entry in other deployments. Saves commit in submission
      * order; a failed save rejects its caller without blocking later saves.
-     * A shared save also retains an available catalog name; metadata failures do not reject the route save.
+     * A shared save uses the caller's already resolved catalog name without an additional lookup.
      * @param next - resolved selection accepted by an entry point.
+     * @param name - optional display name from the entry point's catalog.
      * @returns fulfillment after the preference or optional profile write settles.
      */
-    saveSelection(next: ModelSelection): Promise<void>;
+    saveSelection(next: ModelSelection, name?: string): Promise<void>;
 }
 export default AgentDefaultModelConfig;
 //# sourceMappingURL=index.d.ts.map