@ycodium-ai/agent-dsh 0.2.2690 → 0.2.2694

package/README.md

@@ -22,6 +22,13 @@ Facts:
   disk format is unchanged.
 - Credentials come from the environment (`DEEPSEEK_API_KEY`); there is no login
   command and no device-code flow, so `ExecutorInstance.signIn` is not implemented.
+- Usage (ADR-0034): DSH runs on a DeepSeek API key, so the quota is the account's remaining
+  balance, not windows. `ExecutorInstance.usage.readQuota` calls `GET https://api.deepseek.com/user/balance`
+  (through `host.fetch`) and maps each `balance_infos` entry to a money balance in the currency the reply
+  names. The key is found the way DSH finds it: instance environment table / process environment, then
+  `$DSH_HOME/.credentials.yaml` `refs.DEEPSEEK_API_KEY`, then `$DSH_HOME/.env`. A `DEEPSEEK_BASE_URL` that is
+  not `api.deepseek.com` reports `customEndpoint` and sends nothing. No `readTokenUsage`: DSH's ACP reply
+  carries no usage and its session log (`session.v4.jsonl.zstd`) has no per-event timestamps.
 - Manifest permission is `{ kind: "executor" }`.
 - Session model switching is `unsupported` on the card: the plugin does not switch
   models inside a running session.

package/dist/index.js

@@ -24903,6 +24903,13 @@ function parseSessionModeState(sessionResponse) {
     availableModes
   };
 }
+function acpCommandsToSlashCommands(commands) {
+  return commands.map((command) => ({
+    name: command.name,
+    ...command.description === void 0 ? {} : { description: command.description },
+    ...command.inputHint === void 0 ? {} : { input: { hint: command.inputHint } }
+  }));
+}
 function parseAvailableCommandsUpdate(params) {
   const update = params.update;
   if (update["sessionUpdate"] !== "available_commands_update") {
@@ -25354,24 +25361,7 @@ function filterMcpServersByAgentCapabilities(mcpServers, agentCapabilities) {
   });
 }
 
-// ../../packages/ycodium-acp-executor/src/vendor-hooks.ts
-var defaultVendorHooks = {
-  completedStopReason: (response) => response.stopReason
-};
-
-// ../../packages/ycodium-acp-executor/src/executor.ts
-var DEFAULT_CANCEL_GRACE_MS = 5e3;
-var userInputAnswerOptionId = (question, answers) => {
-  const answer = answers[question.id];
-  const selected = typeof answer === "string" ? answer : Array.isArray(answer) && answer.length === 1 && typeof answer[0] === "string" ? answer[0] : void 0;
-  return selected !== void 0 && question.options.some((option) => option.id === selected) ? selected : void 0;
-};
-function defaultNowIso() {
-  return (/* @__PURE__ */ new Date()).toISOString();
-}
-function defaultRandomId() {
-  return NodeCrypto.randomUUID();
-}
+// ../../packages/ycodium-acp-executor/src/model-selection.ts
 function normalizeModelId(value) {
   return value?.trim() || void 0;
 }
@@ -25390,6 +25380,25 @@ function modelSelectionStateFromSetup(setup) {
     advertisedModelValues: strategy === "config-option" ? modelConfigOption === void 0 ? [] : collectSessionConfigOptionValues(modelConfigOption) : collectSessionModelIds(sessionModels)
   };
 }
+
+// ../../packages/ycodium-acp-executor/src/vendor-hooks.ts
+var defaultVendorHooks = {
+  completedStopReason: (response) => response.stopReason
+};
+
+// ../../packages/ycodium-acp-executor/src/executor.ts
+var DEFAULT_CANCEL_GRACE_MS = 5e3;
+var userInputAnswerOptionId = (question, answers) => {
+  const answer = answers[question.id];
+  const selected = typeof answer === "string" ? answer : Array.isArray(answer) && answer.length === 1 && typeof answer[0] === "string" ? answer[0] : void 0;
+  return selected !== void 0 && question.options.some((option) => option.id === selected) ? selected : void 0;
+};
+function defaultNowIso() {
+  return (/* @__PURE__ */ new Date()).toISOString();
+}
+function defaultRandomId() {
+  return NodeCrypto.randomUUID();
+}
 function createAcpExecutor(options) {
   const hooks = { ...defaultVendorHooks, ...options.hooks };
   const cancelGraceMs = options.cancelGraceMs ?? DEFAULT_CANCEL_GRACE_MS;
@@ -25599,6 +25608,7 @@ function createAcpExecutor(options) {
     const commands = parseAvailableCommandsUpdate(params);
     if (commands !== void 0) {
       availableCommands = commands;
+      options.onAvailableCommands?.(commands);
     }
     if (sessionLoadInFlight) {
       droppedReplayUpdates += parsed.events.filter((event) => event._tag !== "ModeChanged").length;
@@ -26760,6 +26770,164 @@ async function probeCliVersion(input2) {
   }
 }
 
+// src/dshBalance.ts
+import * as NodeCrypto2 from "node:crypto";
+import * as NodeFS from "node:fs";
+import * as NodeOS from "node:os";
+import * as NodePath from "node:path";
+import {
+  parseRetryAfterMs
+} from "@ycodium-ai/plugin-api/usage";
+var BALANCE_URL = "https://api.deepseek.com/user/balance";
+var OFFICIAL_HOSTS = /* @__PURE__ */ new Set(["api.deepseek.com"]);
+var API_KEY_NAME = "DEEPSEEK_API_KEY";
+var BASE_URL_NAME = "DEEPSEEK_BASE_URL";
+var TIMEOUT_MS = 1e4;
+var asObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
+var parseJson = (raw) => {
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+};
+var readFile = (path) => {
+  try {
+    return NodeFS.readFileSync(path, "utf8");
+  } catch {
+    return null;
+  }
+};
+var unquote = (raw) => {
+  const trimmed = raw.trim();
+  const quoted = /^(["'])(.*)\1/.exec(trimmed);
+  if (quoted?.[2] !== void 0) return quoted[2];
+  return (trimmed.split(/\s+#/)[0] ?? "").trim();
+};
+var readCredentialsYamlRef = (yaml, name) => {
+  let inRefs = false;
+  for (const line of yaml.split(/\r?\n/)) {
+    if (line.trim().length === 0 || line.trimStart().startsWith("#")) continue;
+    if (!/^\s/.test(line)) {
+      inRefs = /^refs\s*:\s*(?:#.*)?$/.test(line);
+      continue;
+    }
+    if (!inRefs) continue;
+    const match = /^\s+([A-Za-z_][A-Za-z0-9_]*)\s*:\s*(.*)$/.exec(line);
+    if (match?.[1] === name) {
+      const value = unquote(match[2] ?? "");
+      return value.length > 0 ? value : null;
+    }
+  }
+  return null;
+};
+var readDotenvValue = (dotenv, name) => {
+  for (const line of dotenv.split(/\r?\n/)) {
+    const match = /^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)$/.exec(line);
+    if (match?.[1] !== name) continue;
+    const value = unquote(match[2] ?? "");
+    return value.length > 0 ? value : null;
+  }
+  return null;
+};
+var nonEmpty = (value) => {
+  const trimmed = value?.trim() ?? "";
+  return trimmed.length > 0 ? trimmed : null;
+};
+var asMoney = (value) => {
+  const parsed = typeof value === "number" ? value : typeof value === "string" ? Number(value) : NaN;
+  return Number.isFinite(parsed) ? parsed : null;
+};
+var dshBalances = (body) => {
+  const infos = asObject(body)?.["balance_infos"];
+  if (!Array.isArray(infos)) return [];
+  const balances = [];
+  for (const entry of infos) {
+    const info = asObject(entry);
+    const currency = typeof info?.["currency"] === "string" ? info["currency"].trim() : "";
+    const total = asMoney(info?.["total_balance"]);
+    if (info === null || !/^[A-Z]{3}$/.test(currency) || total === null) continue;
+    balances.push({
+      id: `balance-${currency}`,
+      label: { key: "usage.balance.account" },
+      remaining: total,
+      used: null,
+      limit: null,
+      unit: { kind: "money", currency },
+      resetsAt: null
+    });
+  }
+  return balances;
+};
+var createDshUsage = (input2) => {
+  const now = input2.now ?? Date.now;
+  const processEnv = input2.processEnv ?? process.env;
+  const envValue = (name) => nonEmpty(input2.environment[name]) ?? nonEmpty(processEnv[name]);
+  const dshHome = () => nonEmpty(input2.environment[input2.homeEnvVar]) ?? nonEmpty(input2.homePath) ?? nonEmpty(processEnv[input2.homeEnvVar]) ?? NodePath.join(NodeOS.homedir(), ".dsh");
+  const resolveKey = () => {
+    const fromEnvironment = envValue(API_KEY_NAME);
+    if (fromEnvironment !== null) return fromEnvironment;
+    const home = dshHome();
+    const yaml = readFile(NodePath.join(home, ".credentials.yaml"));
+    const fromYaml = yaml === null ? null : readCredentialsYamlRef(yaml, API_KEY_NAME);
+    if (fromYaml !== null) return fromYaml;
+    const dotenv = readFile(NodePath.join(home, ".env"));
+    return dotenv === null ? null : readDotenvValue(dotenv, API_KEY_NAME);
+  };
+  const readQuota = async (request) => {
+    const baseUrl = envValue(BASE_URL_NAME);
+    if (baseUrl !== null) {
+      const host = URL.parse(baseUrl)?.hostname.toLowerCase();
+      if (host === void 0 || !OFFICIAL_HOSTS.has(host)) {
+        return { status: "unavailable", reason: "customEndpoint" };
+      }
+    }
+    const key = resolveKey();
+    if (key === null) return { status: "unavailable", reason: "missingCredentials" };
+    let response;
+    try {
+      response = await input2.fetch(BALANCE_URL, {
+        headers: { Authorization: `Bearer ${key}`, Accept: "application/json" },
+        signal: AbortSignal.any([
+          ...request.signal === void 0 ? [] : [request.signal],
+          AbortSignal.timeout(TIMEOUT_MS)
+        ])
+      });
+    } catch {
+      return { status: "unavailable", reason: "unreachable" };
+    }
+    if (response.status === 401 || response.status === 403) {
+      return { status: "unavailable", reason: "authRejected" };
+    }
+    if (response.status === 429) {
+      const retryAfterMs = parseRetryAfterMs(response.headers.get("retry-after"), now());
+      return {
+        status: "unavailable",
+        reason: "rateLimited",
+        ...retryAfterMs === null ? {} : { retryAfterMs }
+      };
+    }
+    if (!response.ok) return { status: "unavailable", reason: "unreachable" };
+    let body;
+    try {
+      body = parseJson(await response.text());
+    } catch {
+      return { status: "unavailable", reason: "unreachable" };
+    }
+    if (asObject(body) === null || !Array.isArray(asObject(body)?.["balance_infos"])) {
+      return { status: "unavailable", reason: "unreachable" };
+    }
+    return {
+      status: "available",
+      windows: [],
+      balances: dshBalances(body),
+      // 同一把 key 的两个实例是同一个账户：用 key 的指纹合成一行（指纹不可逆，不含 key 本身）。
+      accountKey: `deepseek:${NodeCrypto2.createHash("sha256").update(key).digest("hex").slice(0, 12)}`
+    };
+  };
+  return { readQuota };
+};
+
 // src/config.ts
 var DSH_DEFAULT_LAUNCH_ARGS = "--profile acp";
 function isRecord6(value) {
@@ -26857,9 +27025,9 @@ function tokenizeLaunchArgs(value) {
 }
 
 // src/probeModels.ts
-import * as NodeFS from "node:fs";
-import * as NodeOS2 from "node:os";
-import * as NodePath2 from "node:path";
+import * as NodeFS2 from "node:fs";
+import * as NodeOS3 from "node:os";
+import * as NodePath3 from "node:path";
 import {
   describeExecutorSpawnFailure,
   ExecutorSpawnRefusedError
@@ -26867,8 +27035,8 @@ import {
 import { nodeStreamsFromHandle } from "@ycodium-ai/plugin-api/process-stdin";
 
 // src/spawnEnv.ts
-import * as NodeOS from "node:os";
-import * as NodePath from "node:path";
+import * as NodeOS2 from "node:os";
+import * as NodePath2 from "node:path";
 import { mergeLaunchEnv } from "@ycodium-ai/plugin-api/executor";
 
 // src/permission.ts
@@ -26911,20 +27079,20 @@ function dshPermissionEnv(nativeModeId) {
 
 // src/spawnEnv.ts
 function expandHomePath(value) {
-  if (value === "~") return NodeOS.homedir();
+  if (value === "~") return NodeOS2.homedir();
   if (value.startsWith("~/") || value.startsWith("~\\")) {
-    return NodePath.join(NodeOS.homedir(), value.slice(2));
+    return NodePath2.join(NodeOS2.homedir(), value.slice(2));
   }
   return value;
 }
 function resolveHomePath(value) {
   const trimmed = value.trim();
   if (trimmed.length === 0) return "";
-  return NodePath.resolve(expandHomePath(trimmed));
+  return NodePath2.resolve(expandHomePath(trimmed));
 }
 function dshContinuationKey(homePath) {
   const resolved = resolveHomePath(homePath);
-  return `dsh:home:${resolved.length > 0 ? resolved : NodePath.join(NodeOS.homedir(), ".dsh")}`;
+  return `dsh:home:${resolved.length > 0 ? resolved : NodePath2.join(NodeOS2.homedir(), ".dsh")}`;
 }
 function buildSpawnEnv(recipe, resolvedHomePath, nativeModeId) {
   const homeEnvVar = recipe.homeEnvVar.trim() || DSH_CARD.homeEnvVar;
@@ -26942,7 +27110,7 @@ function buildSpawnEnv(recipe, resolvedHomePath, nativeModeId) {
 var PROBE_REQUEST_TIMEOUT_MS = 15e3;
 function dshProbeSessionCwd(instanceId) {
   const safe = instanceId.trim().replace(/[^A-Za-z0-9._-]/g, "-") || "instance";
-  return NodePath2.join(NodeOS2.tmpdir(), `ycodium-dsh-probe-${safe}`);
+  return NodePath3.join(NodeOS3.tmpdir(), `ycodium-dsh-probe-${safe}`);
 }
 function isRecord7(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -27004,7 +27172,7 @@ async function probeDshModels(input2) {
   const { recipe, host } = input2;
   const probeCwd = dshProbeSessionCwd(host.instanceId);
   try {
-    NodeFS.mkdirSync(probeCwd, { recursive: true });
+    NodeFS2.mkdirSync(probeCwd, { recursive: true });
   } catch (error62) {
     return { kind: "failed", detail: failureDetail(error62) };
   }
@@ -27191,6 +27359,11 @@ var createDshInstance = (config2, host) => {
         providerInstanceId: host.instanceId,
         clientInfo: DSH_CLIENT_INFO,
         log: host.log,
+        // agent 自己宣告的斜杠命令按会话报给宿主，输入区的 / 菜单才有它们。
+        onAvailableCommands: (commands) => host.reportSessionInventory?.({
+          threadId: input2.threadId,
+          slashCommands: acpCommandsToSlashCommands(commands)
+        }),
         // 该 agent 不实现 session/load，只实现 session/resume——续接重新激活
         // 持久会话而不重放记录，发 load 会卡在永远不结算的重放门上。
         resumeMethod: "session/resume",
@@ -27323,6 +27496,13 @@ var createDshInstance = (config2, host) => {
       return { threadId, turns: booked.turns };
     },
     events,
+    // 额度是 DeepSeek 账户的剩余金额（API key，没有订阅窗口）；token 暂无来源，见 dshBalance.ts 与 README。
+    usage: createDshUsage({
+      environment: recipe.environment,
+      homePath: resolveHomePath(recipe.homePath),
+      homeEnvVar: recipe.homeEnvVar.trim() || DSH_CARD.homeEnvVar,
+      fetch: host.fetch
+    }),
     continuationKey: dshContinuationKey(recipe.homePath),
     dispose: async () => {
       if (disposed) return;

package/locales/en.json

@@ -10,5 +10,10 @@
       "description": "Sessions live here, so providers sharing this directory can pick up each other's threads and providers with different directories cannot. Leave empty to use the CLI's default (~/.dsh).",
       "placeholder": "e.g. ~/.dsh-work"
     }
+  },
+  "usage": {
+    "balance": {
+      "account": "Account balance"
+    }
   }
 }

package/locales/zh-CN.json

@@ -10,5 +10,10 @@
       "description": "会话保存在这里，因此共用同一目录的 provider 可以接手彼此的会话，目录不同的则不能。留空则使用该命令行工具的默认目录（~/.dsh）。",
       "placeholder": "例如 ~/.dsh-work"
     }
+  },
+  "usage": {
+    "balance": {
+      "account": "账户余额"
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-dsh",
-  "version": "0.2.2690",
+  "version": "0.2.2694",
   "description": "DeepSeek Harness executor: dsh CLI over Agent Client Protocol stdio.",
   "keywords": [
     "ycodium",
@@ -21,9 +21,9 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "ycodium-acp-executor": "0.2.2690",
+    "@ycodium-ai/plugin-api": "0.2.2694",
     "ycodium-executor-testing": "0.0.0",
-    "@ycodium-ai/plugin-api": "0.2.2690"
+    "ycodium-acp-executor": "0.2.2694"
   },
   "ycodium": {
     "plugin": "./dist/index.js",