@siliconflow-official/dsh-llm-siliconflow 0.2.0-rc.1 → 0.2.0-rc.2

package/README.md

@@ -34,6 +34,14 @@ dsh-siliconflow-setup
 export SILICONFLOW_API_KEY=sk-...   # 或写入 $DSH_HOME/.credentials.yaml
 ```
 
+写入 `.credentials.yaml` 时使用 dsh ≥ 0.1.2 的 version-1 布局（`version: 1` + `refs:` 嵌套）；向导会识别并就地升级本向导早期版本写入的 pre-release 顶层扁平布局，其他无法识别的文档会明确报错而不是被改写：
+
+```yaml
+version: 1
+refs:
+  SILICONFLOW_API_KEY: sk-...
+```
+
 在包发布到 npm 之前，先用 `pnpm install && pnpm build` 构建出 `lib/`，再从本地路径安装：
 
 ```sh

package/lib/bin.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { a as PUBLIC_BASE_URL, g as discoverChatModels, i as PROVIDER, n as DEFAULT_API_KEY_ENV, r as DEFAULT_MODELS } from "./types-BWDupDnP.js";
+import { a as PUBLIC_BASE_URL, g as discoverChatModels, i as PROVIDER, n as DEFAULT_API_KEY_ENV, r as DEFAULT_MODELS } from "./types-iMqgaeX4.js";
 import { createInterface } from "node:readline/promises";
 import { stdin, stdout } from "node:process";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
-import { parseDocument } from "yaml";
+import { Pair, YAMLMap, parseDocument } from "yaml";
 //#region lib/types/setup.js
 /**
 * Interactive setup wizard core for {@link @siliconflow-official/dsh-llm-siliconflow}:
@@ -45,11 +45,81 @@ function settingsPath(home) {
 function isEnoent(error) {
 	return error.code === "ENOENT";
 }
+/** The credentials document layout version this wizard reads and writes. */
+const CREDENTIALS_LAYOUT_VERSION = 1;
+/** POSIX identifier rule the credentials seam addresses references by. */
+const REF_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
 /**
-* Read one credential reference from a comment-preserving document.
+* Recognize one parsed credentials document.
+* @param document - the parsed document; parse errors make it unrecognizable.
+* @returns the admitted layout with its references — plus, under `extraKeys`,
+*   any top-level key a pre-fix release of this wizard left beside `version`,
+*   held out of `entries` so reads treat them as absent while the write path
+*   folds them back under `refs` — or `undefined` when the document does not
+*   parse, holds an unknown `version`, carries a `refs` section that is not a
+*   mapping of reference names to non-empty strings, or holds any other
+*   top-level entry this build cannot attribute to its own predecessor.
+*/
+function admitCredentialsDocument(document) {
+	if (document.errors.length > 0) return void 0;
+	const root = document.toJS() ?? {};
+	if (typeof root !== "object" || root === null) return void 0;
+	const fields = root;
+	const entries = /* @__PURE__ */ new Map();
+	if (!("version" in fields)) {
+		for (const [key, value] of Object.entries(fields)) {
+			if (!REF_NAME_PATTERN.test(key)) return void 0;
+			if (typeof value !== "string" || value.length === 0) return void 0;
+			entries.set(key, value);
+		}
+		return {
+			kind: "flat",
+			entries
+		};
+	}
+	if (fields.version !== CREDENTIALS_LAYOUT_VERSION) return void 0;
+	const refs = fields["refs"];
+	if (refs !== void 0) {
+		if (typeof refs !== "object" || refs === null) return void 0;
+		for (const [key, value] of Object.entries(refs)) {
+			if (!REF_NAME_PATTERN.test(key)) return void 0;
+			if (typeof value !== "string" || value.length === 0) return void 0;
+			entries.set(key, value);
+		}
+	}
+	const extraKeys = /* @__PURE__ */ new Map();
+	for (const [key, value] of Object.entries(fields)) {
+		if (key === "version" || key === "refs" || key === "records") continue;
+		if (!REF_NAME_PATTERN.test(key) || typeof value !== "string" || value.length === 0) return void 0;
+		extraKeys.set(key, value);
+	}
+	return {
+		kind: "versioned",
+		entries,
+		...extraKeys.size > 0 ? { extraKeys } : {}
+	};
+}
+/**
+* Nest a pre-release flat document under `refs:` with a `version` stamp. The
+* whole current root — every flat entry, comments included — becomes the
+* `refs` section verbatim, so every other provider's key migrates in the same
+* write; the new root carries `version` and `refs` in that order, matching how
+* `dsh-credentials-local` writes one from scratch.
+* @param document - the admitted flat document to upgrade in place.
+*/
+function upgradeFlatDocument(document) {
+	const refs = document.contents instanceof YAMLMap ? document.contents : new YAMLMap();
+	const root = new YAMLMap();
+	root.add(new Pair("version", CREDENTIALS_LAYOUT_VERSION));
+	root.add(new Pair("refs", refs));
+	document.contents = root;
+}
+/**
+* Read one credential reference from a versioned or pre-release flat document.
 * @param path - the credentials document path.
-* @param keyEnv - the top-level reference name (e.g. `SILICONFLOW_API_KEY`).
-* @returns the stored value, or `undefined` when absent or the file is missing.
+* @param keyEnv - the reference name to read (e.g. `SILICONFLOW_API_KEY`).
+* @returns the stored value, or `undefined` when the reference is absent, the
+*   file is missing, or the document is not a recognizable layout.
 */
 async function readCredential(path, keyEnv) {
 	let text;
@@ -59,18 +129,31 @@ async function readCredential(path, keyEnv) {
 		if (isEnoent(error)) return void 0;
 		throw error;
 	}
-	const value = parseDocument(text).toJS()?.[keyEnv];
-	return typeof value === "string" && value.length > 0 ? value : void 0;
+	const admitted = admitCredentialsDocument(parseDocument(text));
+	if (admitted === void 0) return void 0;
+	return admitted.entries.get(keyEnv);
 }
 /**
-* Set one credential reference, preserving every other entry and comment.
+* Write one credential reference into the versioned layout, preserving every
+* other entry and comment. A pre-release flat document is upgraded in place,
+* and a top-level key a pre-fix release of this wizard left beside `version`
+* is folded back under `refs`, so one run repairs the file its predecessor
+* corrupted. An unrecognized document fails loud instead of being rewritten —
+* a silent rewrite would hide why the running harness rejects it.
 * @param path - the credentials document path; created when absent.
-* @param keyEnv - the top-level reference name to write.
+* @param keyEnv - the reference name to write.
 * @param key - the value.
+* @throws when the document exists but is not a recognizable credentials layout.
 */
 async function writeCredential(path, keyEnv, key) {
 	const doc = await loadDocument(path);
-	doc.set(keyEnv, key);
+	const admitted = admitCredentialsDocument(doc);
+	if (admitted === void 0) throw new Error(`setup: ${path} is not a recognizable credentials document (expected version 1 with a refs section, or the pre-release flat layout); fix it before running setup`);
+	if (admitted.kind === "flat") upgradeFlatDocument(doc);
+	for (const extra of admitted.extraKeys?.keys() ?? []) doc.deleteIn([extra]);
+	for (const [extra, value] of admitted.extraKeys ?? /* @__PURE__ */ new Map()) doc.setIn(["refs", extra], value);
+	doc.setIn(["version"], CREDENTIALS_LAYOUT_VERSION);
+	doc.setIn(["refs", keyEnv], key);
 	await persistDocument(path, doc);
 }
 /**

package/lib/index.js

@@ -1,2 +1,2 @@
-import { _ as listingUrl, a as PUBLIC_BASE_URL, c as name, d as DEFAULT_MAX_TOKENS, f as DEFAULT_STREAM_IDLE_TIMEOUT_MS, g as discoverChatModels, h as inferInputModalities, i as PROVIDER, l as resolveAdapterOptions, m as SiliconFlowAdapter, n as DEFAULT_API_KEY_ENV, o as apply, p as DISCOVERY_TTL_MS, r as DEFAULT_MODELS, s as inject, t as Config, u as DEFAULT_CONTEXT_WINDOW, v as readListing } from "./types-BWDupDnP.js";
+import { _ as listingUrl, a as PUBLIC_BASE_URL, c as name, d as DEFAULT_MAX_TOKENS, f as DEFAULT_STREAM_IDLE_TIMEOUT_MS, g as discoverChatModels, h as inferInputModalities, i as PROVIDER, l as resolveAdapterOptions, m as SiliconFlowAdapter, n as DEFAULT_API_KEY_ENV, o as apply, p as DISCOVERY_TTL_MS, r as DEFAULT_MODELS, s as inject, t as Config, u as DEFAULT_CONTEXT_WINDOW, v as readListing } from "./types-iMqgaeX4.js";
 export { Config, DEFAULT_API_KEY_ENV, DEFAULT_CONTEXT_WINDOW, DEFAULT_MAX_TOKENS, DEFAULT_MODELS, DEFAULT_STREAM_IDLE_TIMEOUT_MS, DISCOVERY_TTL_MS, PROVIDER, PUBLIC_BASE_URL, SiliconFlowAdapter, apply, discoverChatModels, inferInputModalities, inject, listingUrl, name, readListing, resolveAdapterOptions };

package/lib/types/setup.d.ts

@@ -56,17 +56,24 @@ export declare function credentialsPath(home: string): string;
 /** The settings document path under a harness home. */
 export declare function settingsPath(home: string): string;
 /**
- * Read one credential reference from a comment-preserving document.
+ * Read one credential reference from a versioned or pre-release flat document.
  * @param path - the credentials document path.
- * @param keyEnv - the top-level reference name (e.g. `SILICONFLOW_API_KEY`).
- * @returns the stored value, or `undefined` when absent or the file is missing.
+ * @param keyEnv - the reference name to read (e.g. `SILICONFLOW_API_KEY`).
+ * @returns the stored value, or `undefined` when the reference is absent, the
+ *   file is missing, or the document is not a recognizable layout.
  */
 export declare function readCredential(path: string, keyEnv: string): Promise<string | undefined>;
 /**
- * Set one credential reference, preserving every other entry and comment.
+ * Write one credential reference into the versioned layout, preserving every
+ * other entry and comment. A pre-release flat document is upgraded in place,
+ * and a top-level key a pre-fix release of this wizard left beside `version`
+ * is folded back under `refs`, so one run repairs the file its predecessor
+ * corrupted. An unrecognized document fails loud instead of being rewritten —
+ * a silent rewrite would hide why the running harness rejects it.
  * @param path - the credentials document path; created when absent.
- * @param keyEnv - the top-level reference name to write.
+ * @param keyEnv - the reference name to write.
  * @param key - the value.
+ * @throws when the document exists but is not a recognizable credentials layout.
  */
 export declare function writeCredential(path: string, keyEnv: string, key: string): Promise<void>;
 /**

package/lib/{types-BWDupDnP.js → types-iMqgaeX4.js}

@@ -1,8 +1,8 @@
 import z from "@deepseek-ai/schemastery";
-import { CONTEXT_WINDOW_EXCEEDED_CODE, CallId, EMPTY_RESPONSE_CODE, LlmAdapter, LlmError, ProviderRequestId, QUOTA_EXCEEDED_CODE, RetryPolicySchema, assertUsableApiKey, attributionHeaders, isContextWindowExceededError, isQuotaExceededError, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
+import { CONTEXT_WINDOW_EXCEEDED_CODE, EMPTY_RESPONSE_CODE, LlmAdapter, LlmError, ProviderRequestId, QUOTA_EXCEEDED_CODE, RetryPolicySchema, ToolCallId, assertUsableApiKey, attributionHeaders, isContextWindowExceededError, isQuotaExceededError, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { launchEnvironmentOf } from "@deepseek-ai/dsh-launch-environment";
-import { deepEqualJson, installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
+import { deepEqualJson } from "@deepseek-ai/dsh-util-values";
 import { MAX_TIMER_DELAY_MS, idleWatchdog, timeoutOf } from "@deepseek-ai/dsh-timeout";
 import { getOrCreateAnonymousUserId } from "@deepseek-ai/dsh-anonymous-user-id";
 import { EventSourceParserStream } from "eventsource-parser/stream";
@@ -408,7 +408,7 @@ function closeBlock(block) {
 		};
 		case "tool-call": return {
 			type: "tool-call",
-			id: CallId(block.callId ?? ""),
+			id: ToolCallId(block.callId ?? ""),
 			name: block.name ?? "",
 			arguments: block.text
 		};
@@ -523,7 +523,7 @@ async function* translate(payloads) {
 				yield {
 					type: "tool-call-delta",
 					index: block.index,
-					id: CallId(block.callId ?? ""),
+					id: ToolCallId(block.callId ?? ""),
 					...block.name !== void 0 ? { name: block.name } : {},
 					argumentsDelta: fragment
 				};
@@ -896,7 +896,7 @@ var SiliconFlowAdapter = class extends LlmAdapter {
 */
 const name = "llm-siliconflow";
 const inject = ["llm"];
-const NS = settingsNamespace("llm-siliconflow");
+const NS = "llm-siliconflow";
 /** Credential reference this plugin reads by default, also used by the setup CLI. */
 const DEFAULT_API_KEY_ENV = "SILICONFLOW_API_KEY";
 /** The single provider route this plugin owns. */
@@ -1125,11 +1125,13 @@ function apply(ctx, config) {
 		registration.replace([PROVIDER]);
 		registeredPolicy = policy;
 	};
-	installSettingsSection(ctx, NS, Config, config, {
-		setSource: (source) => {
-			current = source;
-		},
-		onChange: ensureRegistrationFacts
+	ctx.inject(["settings"], (settingsCtx) => {
+		settingsCtx.settings.installSection(ctx, NS, Config, config, {
+			setSource: (source) => {
+				current = source;
+			},
+			onChange: ensureRegistrationFacts
+		});
 	});
 }
 //#endregion

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@siliconflow-official/dsh-llm-siliconflow",
   "description": "SiliconFlow (OpenAI-compatible) chat-completions adapter plugin for the DeepSeek Harness LLM seam",
-  "version": "0.2.0-rc.1",
+  "version": "0.2.0-rc.2",
   "publishConfig": {
     "access": "public"
   },
@@ -51,7 +51,8 @@
     "@deepseek-ai/dsh-launch-environment": ">=0.0.1-rc.0",
     "@deepseek-ai/dsh-llm": ">=0.0.1-rc.0",
     "@deepseek-ai/dsh-settings": ">=0.0.1-rc.0",
-    "@deepseek-ai/dsh-timeout": ">=0.0.1-rc.0"
+    "@deepseek-ai/dsh-timeout": ">=0.0.1-rc.0",
+    "@deepseek-ai/dsh-util-values": "*"
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
@@ -59,18 +60,18 @@
     "yaml": "^2.9.0"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-anonymous-user-id": ">=0.0.1-rc.0",
-    "@deepseek-ai/dsh-attachment": ">=0.0.1-rc.0",
-    "@deepseek-ai/dsh-credentials": ">=0.0.1-rc.0",
-    "@deepseek-ai/dsh-invariants": ">=0.0.1-rc.0",
-    "@deepseek-ai/dsh-launch-environment": ">=0.0.1-rc.0",
-    "@deepseek-ai/dsh-llm": ">=0.0.1-rc.0",
-    "@deepseek-ai/dsh-settings": ">=0.0.1-rc.0",
-    "@deepseek-ai/dsh-timeout": ">=0.0.1-rc.0",
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-anonymous-user-id": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-attachment": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-credentials": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-invariants": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-launch-environment": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-settings": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-timeout": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-util-values": "0.1.5-rc.2",
     "@types/node": "^22.0.0",
     "tsdown": "^0.22.0",
-    "typescript": "^6.0.0",
-    "unrun": "^0.3.1"
+    "typescript": "^6.0.0"
   }
 }