paseo-dsh-direct 0.2.3 → 0.2.5

package/OVERVIEW.md

@@ -12,6 +12,7 @@ Runs DeepSeek Harness (`dsh`) as a native Paseo agent provider. Paseo clients (d
 - Streaming assistant text and reasoning ("thinking") as Paseo timeline items.
 - Tool calls with Paseo approval prompts, and `dsh` user questions answered from the Paseo UI.
 - Create, resume, cancel and close sessions; model list and mode switching from the Paseo UI.
+- Token usage and context-window fill in Paseo's usage meter.
 - DSH branding (name and icon) in the provider list.
 
 ## Processes and environment

package/README.md

@@ -25,6 +25,7 @@ Most dsh integrations go through ACP, a generic protocol that every agent can sp
 - Tool approvals and dsh's questions to you appear as Paseo's own approval and question cards.
 - Your existing dsh sessions can be imported and resumed in Paseo.
 - dsh's slash commands (`/compact`, `/plan`, ...) appear in Paseo's `/` menu.
+- Paseo's usage meter shows dsh's token counts and how full the context window is.
 
 ## Versioning
 

package/README.zh.md

@@ -25,6 +25,7 @@
 - 工具审批和 dsh 向你提的问题，显示成 Paseo 自带的审批卡片和问答卡片。
 - 已有的 dsh 会话可以导入 Paseo 接着用。
 - dsh 的斜杠命令（`/compact`、`/plan` 等）出现在 Paseo 的 `/` 菜单里。
+- Paseo 的用量表显示 dsh 的 token 用量和上下文占用。
 
 ## 版本号
 

package/dsh.svg

@@ -1,11 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" role="img" aria-label="DeepSeek Harness">
-  <defs>
-    <linearGradient id="wave" x1="8" y1="10" x2="56" y2="54" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#6A8DFF"/>
-      <stop offset="1" stop-color="#3158E6"/>
-    </linearGradient>
-  </defs>
-  <path fill="url(#wave)" d="M8 34c7-13 18-20 33-20 6 0 11 1 15 4-2 13-8 23-18 29-8 5-17 6-27 3 7-2 12-6 15-11-7 2-13 0-18-5Z"/>
-  <circle cx="43" cy="25" r="3" fill="#fff"/>
-  <path d="M13 42c8 4 17 3 25-2" fill="none" stroke="#fff" stroke-width="3" stroke-linecap="round" opacity=".9"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50" fill="currentColor" role="img" aria-label="DeepSeek Harness">
+  <path fill-rule="nonzero" d="M48.8354 10.0479C48.3232 9.79199 48.1025 10.2798 47.8032 10.5278C47.7007 10.6079 47.6143 10.7119 47.5273 10.8076C46.7793 11.624 45.9048 12.1597 44.7622 12.0957C43.0923 12 41.666 12.5356 40.4058 13.8398C40.1377 12.2319 39.2476 11.272 37.8926 10.6558C37.1836 10.3359 36.4668 10.0156 35.9702 9.31982C35.6235 8.82373 35.5293 8.27197 35.356 7.72754C35.2456 7.3999 35.1353 7.06396 34.7651 7.00781C34.3633 6.94385 34.2056 7.2876 34.0479 7.57568C33.418 8.75195 33.1733 10.0479 33.1973 11.3599C33.2524 14.312 34.4736 16.6641 36.8999 18.3359C37.1758 18.5278 37.2466 18.7197 37.1597 19C36.9946 19.5757 36.7974 20.1357 36.624 20.7119C36.5137 21.0801 36.3486 21.1597 35.9624 21C34.6309 20.4321 33.481 19.5918 32.4644 18.5757C30.7393 16.8721 29.1792 14.9917 27.2334 13.52C26.7764 13.1758 26.3193 12.856 25.8467 12.5518C23.8618 10.584 26.1069 8.96777 26.627 8.77588C27.1704 8.57568 26.8159 7.8877 25.0591 7.896C23.3022 7.90381 21.6953 8.50391 19.647 9.30371C19.3477 9.42383 19.0322 9.51172 18.7095 9.58398C16.8501 9.22363 14.9199 9.14355 12.9033 9.37598C9.10596 9.80762 6.07275 11.6396 3.84326 14.7681C1.16455 18.5278 0.53418 22.7998 1.30664 27.2559C2.11768 31.9521 4.46582 35.8398 8.07373 38.8799C11.8159 42.0322 16.1255 43.5762 21.041 43.2803C24.0269 43.104 27.3516 42.6963 31.1016 39.4561C32.0469 39.936 33.0396 40.1279 34.686 40.272C35.9546 40.3921 37.1758 40.208 38.1211 40.0078C39.6021 39.688 39.4995 38.2881 38.9639 38.0322C34.623 35.9678 35.5762 36.8081 34.71 36.1279C36.9155 33.4639 40.2402 30.6958 41.54 21.728C41.6426 21.0161 41.5557 20.5679 41.54 19.9917C41.5322 19.6396 41.6108 19.5039 42.0049 19.4639C43.0923 19.3359 44.1479 19.0317 45.1167 18.4878C47.9292 16.9199 49.064 14.3438 49.3315 11.2559C49.3711 10.7837 49.3237 10.2959 48.8354 10.0479ZM24.3262 37.8398C20.1196 34.4639 18.0791 33.3521 17.2358 33.3999C16.4482 33.4482 16.5898 34.3682 16.7632 34.9678C16.9443 35.5601 17.1812 35.9683 17.5117 36.4878C17.7402 36.832 17.8979 37.3442 17.2832 37.728C15.9282 38.584 13.5728 37.4399 13.4624 37.3838C10.7207 35.7358 8.42822 33.5601 6.81348 30.584C5.25342 27.7197 4.34766 24.6479 4.19775 21.3677C4.1582 20.5757 4.38672 20.2959 5.15869 20.1519C6.17529 19.96 7.22314 19.9199 8.23926 20.0718C12.5327 20.7119 16.1885 22.6719 19.2529 25.7759C21.002 27.5439 22.3252 29.6558 23.6885 31.7202C25.1377 33.9121 26.6978 36 28.6831 37.7119C29.3843 38.312 29.9434 38.7681 30.479 39.104C28.8643 39.2881 26.1699 39.3281 24.3262 37.8398ZM26.3433 24.6001C26.3433 24.248 26.6191 23.9678 26.9658 23.9678C27.0444 23.9678 27.1152 23.9839 27.1782 24.0078C27.2651 24.04 27.3438 24.0879 27.4067 24.1602C27.5171 24.272 27.5801 24.4321 27.5801 24.6001C27.5801 24.9521 27.3042 25.2319 26.9575 25.2319C26.6108 25.2319 26.3433 24.9521 26.3433 24.6001ZM32.6064 27.8799C32.2046 28.0479 31.8027 28.1919 31.4165 28.208C30.8179 28.2397 30.1641 27.9922 29.8096 27.688C29.2583 27.2158 28.8643 26.9521 28.6987 26.1279C28.6279 25.7759 28.6675 25.2319 28.7305 24.9199C28.8721 24.248 28.7144 23.8159 28.2495 23.4238C27.8716 23.104 27.3911 23.0161 26.8633 23.0161C26.666 23.0161 26.4849 22.9277 26.3511 22.856C26.1304 22.7441 25.9492 22.4639 26.1226 22.1201C26.1777 22.0078 26.4458 21.7358 26.5088 21.688C27.2256 21.272 28.0527 21.4077 28.8169 21.7197C29.5259 22.0161 30.0615 22.5601 30.834 23.3281C31.6216 24.2559 31.7632 24.5117 32.2124 25.208C32.5669 25.752 32.8901 26.312 33.1104 26.9521C33.2446 27.3521 33.0713 27.6802 32.6064 27.8799Z"/>
 </svg>

package/index.server.ts

@@ -1,5 +1,6 @@
 import type { PluginServerContext } from "@getpaseo/plugin/server";
 import { launchDshBridge } from "./server/bridge-client.js";
+import { defaultDshCommand } from "./server/dsh-spawn.js";
 import { DSH_BRIDGE_SOURCE } from "./server/generated-bridge.js";
 import { createDshProvider } from "./server/provider.js";
 
@@ -8,6 +9,7 @@ export default function contribute(server: PluginServerContext) {
   server.registerProvider(
     createDshProvider({
       executable,
+      command: defaultDshCommand(process.env),
       createBridge: (launch) =>
         launchDshBridge({
           ...launch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo-dsh-direct",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "DeepSeek Harness Direct Provider Plugin for Paseo",
   "repository": {
     "type": "git",

package/scripts/build.mjs

@@ -13,7 +13,8 @@ const result = await build({
   write: false,
 })
 
-const bridge = result.outputFiles.find(file => file.path.endsWith('/dsh-bridge.mjs'))
+// esbuild reports output paths with the platform separator (backslashes on Windows).
+const bridge = result.outputFiles.find(file => file.path.replace(/\\/g, '/').endsWith('/dsh-bridge.mjs'))
 if (!bridge) throw new Error('esbuild did not produce dist/dsh-bridge.mjs')
 await mkdir('dist', { recursive: true })
 await writeFile('dist/dsh-bridge.mjs', bridge.contents)

package/server/bridge-client.ts

@@ -1,9 +1,10 @@
-import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
+import type { ChildProcessWithoutNullStreams } from "node:child_process";
 import { mkdtemp, rm, stat, writeFile } from "node:fs/promises";
 import { homedir, tmpdir } from "node:os";
 import path from "node:path";
 import { createInterface } from "node:readline";
 import { detectDshVersion } from "./dsh-version.js";
+import { spawnDsh } from "./dsh-spawn.js";
 import type { ProviderLaunch } from "@getpaseo/plugin/server/provider";
 import type {
   BridgeInitializeResult,
@@ -182,10 +183,10 @@ function runProfileInit(
   timeoutMs: number,
 ): Promise<void> {
   return new Promise((resolve, reject) => {
-    const child = spawn(
+    const child = spawnDsh(
       executable,
       [...leadingArgs, "--profile", profile, "--from-default-profile", DEFAULT_PROFILE_TEMPLATE, "--dump-config"],
-      { env, stdio: ["ignore", "ignore", "pipe"], windowsHide: true },
+      { env, stdio: ["ignore", "ignore", "pipe"] },
     );
     let stderr = "";
     child.stderr.setEncoding("utf8");
@@ -293,10 +294,9 @@ function dumpProfileConfig(
   env: Readonly<Record<string, string | undefined>>,
 ): Promise<string> {
   return new Promise((resolve, reject) => {
-    const child = spawn(launch.command, [...launch.args, "--profile", profile, "--dump-config"], {
+    const child = spawnDsh(launch.command, [...launch.args, "--profile", profile, "--dump-config"], {
       env,
       stdio: ["ignore", "pipe", "ignore"],
-      windowsHide: true,
     });
     let stdout = "";
     child.stdout.setEncoding("utf8");
@@ -360,10 +360,9 @@ export async function launchDshBridge(options: LaunchBridgeOptions): Promise<Dsh
     { mode: 0o600 },
   );
 
-  const child = spawn(launch.command, [...launch.args, "--profile", profile, "--patch", patchPath], {
+  const child = spawnDsh(launch.command, [...launch.args, "--profile", profile, "--patch", patchPath], {
     env,
     stdio: ["pipe", "pipe", "pipe"],
-    windowsHide: true,
   });
   const client = new JsonlBridgeClient(child, directory, launch);
   try {

package/server/dsh/host.ts

@@ -125,6 +125,26 @@ export interface HostServices {
     }>;
   };
   agentDefaultModel: { currentSelection(): ModelSelection } | undefined;
+  /**
+   * Projection registry read cut. The `tokenUsage` and `contextPressure` units
+   * carry the figures Paseo renders as session usage; absent when the profile
+   * mounts no projection registry.
+   */
+  sessionProjections?: {
+    snapshot(
+      session: HostSession,
+      keys?: readonly string[],
+    ): { values: Partial<Record<string, unknown>> };
+    /** Change feed: fires once per client-visible unit whose raw view changed. */
+    onChanged(
+      listener: (
+        session: HostSession,
+        key: string,
+        value: unknown,
+        seq: number,
+      ) => void,
+    ): () => void;
+  };
   sessionTitle:
     { rename(session: HostSession, title: string): void } | undefined;
   approval: object | undefined;

package/server/dsh/service.ts

@@ -6,6 +6,7 @@ import type {
   BridgeInitializeResult,
   BridgeMethods,
   BridgeNotifications,
+  BridgeUsage,
   DshSessionEvent,
   InteractionRequest,
   ModelSelection,
@@ -25,6 +26,7 @@ import type {
   HostHandle,
   HostHelpers,
   HostServices,
+  HostSession,
   ModelSelectionRef,
 } from "./host.js";
 
@@ -136,6 +138,8 @@ export class BridgeService {
   private readonly preapproved = new Map<string, ReadonlySet<string>>();
   private readonly interactions = new Map<string, PendingInteraction>();
   private readonly subscriptions: Array<() => void> = [];
+  /** Last usage payload sent per session, so an unchanged fold is not re-sent. */
+  private readonly lastUsage = new Map<string, string>();
   private stopping = false;
   private stopTask?: Promise<{}>;
 
@@ -172,6 +176,19 @@ export class BridgeService {
           notify("session.status", { sessionId: String(agent.id), status });
       }),
     );
+    // Usage rides the projection change feed rather than the session event
+    // stream: it fires exactly when the harness's token fold moves, so no
+    // session-event name has to be guessed and an idle session costs nothing.
+    const projections = ctx.get("sessionProjections");
+    if (projections) {
+      this.subscriptions.push(
+        projections.onChanged((session, key) => {
+          if (key === "tokenUsage" || key === "contextPressure") {
+            this.publishUsage(session);
+          }
+        }),
+      );
+    }
     this.subscriptions.push(
       ctx.on("approval/request", (request, next) => {
         const sessionId = this.rootFor(request.agent);
@@ -216,6 +233,70 @@ export class BridgeService {
     );
   }
 
+  /**
+   * Fold the harness's token projections into Paseo's usage vocabulary.
+   *
+   * `tokenUsage` totals and `contextPressure` carry every figure Paseo can
+   * render, and both are plain numbers, so no live harness object crosses the
+   * wire. Returns undefined when no projection registry is mounted or neither
+   * unit is registered: a profile without them degrades to no usage rather
+   * than failing the turn.
+   */
+  private readUsage(session: HostSession): BridgeUsage | undefined {
+    const projections = this.ctx.get("sessionProjections");
+    if (!projections) return undefined;
+    let values: Partial<Record<string, unknown>>;
+    try {
+      values = projections.snapshot(session, [
+        "tokenUsage",
+        "contextPressure",
+      ]).values;
+    } catch {
+      return undefined;
+    }
+    const tokens = values.tokenUsage as
+      | {
+          uncachedInputTokens?: number;
+          outputTokens?: number;
+          cacheReadTokens?: number;
+        }
+      | undefined;
+    const pressure = values.contextPressure as
+      | { contextWindow?: number; pressureTokens?: number }
+      | undefined;
+    const usage: BridgeUsage = {};
+    if (typeof tokens?.uncachedInputTokens === "number")
+      usage.inputTokens = tokens.uncachedInputTokens;
+    if (typeof tokens?.cacheReadTokens === "number")
+      usage.cachedInputTokens = tokens.cacheReadTokens;
+    if (typeof tokens?.outputTokens === "number")
+      usage.outputTokens = tokens.outputTokens;
+    if (typeof pressure?.pressureTokens === "number")
+      usage.contextWindowUsedTokens = pressure.pressureTokens;
+    if (typeof pressure?.contextWindow === "number")
+      usage.contextWindowMaxTokens = pressure.contextWindow;
+    // The units materialize at zero before any provider usage lands, so a
+    // payload carrying no measured token is warm-up noise, not a reading.
+    const measured =
+      (usage.inputTokens ?? 0) > 0 ||
+      (usage.cachedInputTokens ?? 0) > 0 ||
+      (usage.outputTokens ?? 0) > 0 ||
+      (usage.contextWindowUsedTokens ?? 0) > 0;
+    return measured ? usage : undefined;
+  }
+
+  /** Publish one tracked session's usage, skipping an unchanged fold. */
+  private publishUsage(session: HostSession): void {
+    const sessionId = String(session.id);
+    if (!this.tracked.has(sessionId)) return;
+    const usage = this.readUsage(session);
+    if (!usage) return;
+    const signature = JSON.stringify(usage);
+    if (this.lastUsage.get(sessionId) === signature) return;
+    this.lastUsage.set(sessionId, signature);
+    this.notify("session.usage", { sessionId, usage });
+  }
+
   private rootFor(agent: HostAgent | undefined): string | undefined {
     let id = agent?.id && String(agent.id);
     const seen = new Set<string>();
@@ -652,6 +733,7 @@ export class BridgeService {
         this.opening.delete(id);
         this.tracked.delete(id);
         this.preapproved.delete(id);
+        this.lastUsage.delete(id);
       },
     );
     return task;
@@ -800,6 +882,7 @@ export class BridgeService {
       this.owned.delete(id);
       this.tracked.delete(id);
       this.preapproved.delete(id);
+      this.lastUsage.delete(id);
     })();
     this.closing.set(id, task);
     void task.finally(() => this.closing.delete(id)).catch(() => undefined);

package/server/dsh-spawn.ts

@@ -0,0 +1,134 @@
+import { spawn, type SpawnOptions } from "node:child_process";
+import { existsSync } from "node:fs";
+import path from "node:path";
+
+type Env = Readonly<Record<string, string | undefined>>;
+
+/** A command line `child_process.spawn` can start without a shell. */
+export interface DshSpawn {
+  command: string;
+  args: string[];
+  /** The environment to spawn with: the launch environment, plus what the resolved command needs. */
+  env: Env;
+}
+
+/** The host facts the resolution depends on, injected so the Windows branch is testable anywhere. */
+export interface DshSpawnHost {
+  platform: NodeJS.Platform;
+  exists(file: string): boolean;
+}
+
+const defaultHost: DshSpawnHost = { platform: process.platform, exists: existsSync };
+const DESKTOP_EXE = "DeepSeek Harness.exe";
+const WRAPPER_EXTENSIONS = [".cmd", ".ps1"];
+/** Extensions Node finds itself when spawning a bare name; a match means a real executable wins. */
+const EXECUTABLE_EXTENSIONS = [".com", ".exe"];
+
+/**
+ * Spawns dsh without a shell: `spawn` with `command` / `args` / `env` replaced
+ * by `resolveDshSpawn(command, args, options.env)` and `windowsHide` set. Every
+ * dsh process the plugin starts goes through here.
+ */
+export const spawnDsh = ((command: string, args: readonly string[], options: SpawnOptions) => {
+  const target = resolveDshSpawn(command, args, options.env ?? process.env);
+  return spawn(target.command, target.args, { ...options, env: target.env, windowsHide: true });
+}) as typeof spawn;
+
+/**
+ * The spawn for a dsh command chosen by `resolveDshLaunch`, with `args` being
+ * the launch's leading arguments followed by dsh's own. Other platforms, real
+ * executables and unrecognised layouts pass through unchanged; on Windows an
+ * npm or DSH Desktop `dsh.cmd` / `dsh.ps1` wrapper becomes the command it runs,
+ * and a bare `dsh` not on `PATH` falls back to DSH Desktop's default install.
+ * Layouts and reasons: `docs/server-architecture.md` (dsh 的选择).
+ */
+export function resolveDshSpawn(
+  command: string,
+  args: readonly string[],
+  env: Env,
+  host: DshSpawnHost = defaultHost,
+): DshSpawn {
+  const passthrough = { command, args: [...args], env };
+  if (host.platform !== "win32") return passthrough;
+  if (path.win32.basename(command).toLowerCase() === DESKTOP_EXE.toLowerCase()) {
+    return desktopSpawn(path.win32.dirname(command), args, env, host) ?? passthrough;
+  }
+  const found = findCommand(command, env, host);
+  if (found.kind === "executable") return passthrough;
+  if (found.kind === "missing") {
+    return (command.toLowerCase() === "dsh" ? desktopFallback(args, env, host) : undefined) ?? passthrough;
+  }
+  const directory = path.win32.dirname(found.path);
+  return (
+    npmSpawn(directory, args, env, host) ??
+    // <install>\resources\runtime\cli\bin\dsh.cmd
+    desktopSpawn(path.win32.resolve(directory, "..", "..", "..", ".."), args, env, host) ??
+    passthrough
+  );
+}
+
+/**
+ * The command the provider registers with Paseo. Paseo resolves it on `PATH`
+ * before the plugin sees it, so on Windows, when `PATH` has no `dsh` but DSH
+ * Desktop is installed in its default location, the desktop executable is
+ * registered instead; `resolveDshSpawn` then runs it as dsh. Otherwise `dsh`.
+ */
+export function defaultDshCommand(env: Env, host: DshSpawnHost = defaultHost): string {
+  if (host.platform !== "win32" || findCommand("dsh", env, host).kind !== "missing") return "dsh";
+  return desktopFallback([], env, host)?.command ?? "dsh";
+}
+
+/** npm's layout: `node <wrapper dir>\node_modules\@deepseek-ai\dsh\lib\bin.js`, preferring a `node.exe` beside the wrapper. */
+function npmSpawn(directory: string, args: readonly string[], env: Env, host: DshSpawnHost): DshSpawn | undefined {
+  const binJs = path.win32.join(directory, "node_modules", "@deepseek-ai", "dsh", "lib", "bin.js");
+  if (!host.exists(binJs)) return undefined;
+  const bundledNode = path.win32.join(directory, "node.exe");
+  return { command: host.exists(bundledNode) ? bundledNode : "node", args: [binJs, ...args], env };
+}
+
+/** DSH Desktop's default per-user install, `%LOCALAPPDATA%\Programs\DeepSeek Harness`, when present. */
+function desktopFallback(args: readonly string[], env: Env, host: DshSpawnHost): DshSpawn | undefined {
+  const local = windowsEnv(env, "LOCALAPPDATA");
+  return local ? desktopSpawn(path.win32.join(local, "Programs", "DeepSeek Harness"), args, env, host) : undefined;
+}
+
+/** DSH Desktop's own CLI, as its `dsh.cmd` runs it, when `install` holds a desktop install. */
+function desktopSpawn(install: string, args: readonly string[], env: Env, host: DshSpawnHost): DshSpawn | undefined {
+  const exe = path.win32.join(install, DESKTOP_EXE);
+  const asar = path.win32.join(install, "resources", "app.asar");
+  if (!host.exists(exe) || !host.exists(asar)) return undefined;
+  const cli = path.win32.join(asar, "dsh", "node_modules", "@deepseek-ai", "dsh-desktop-host", "lib", "cli.js");
+  return { command: exe, args: ["--expose-internals", cli, ...args], env: { ...env, ELECTRON_RUN_AS_NODE: "1" } };
+}
+
+type Found = { kind: "executable" } | { kind: "wrapper"; path: string } | { kind: "missing" };
+
+/** What `command` names: a wrapper script, a real executable Node finds first, or nothing. */
+function findCommand(command: string, env: Env, host: DshSpawnHost): Found {
+  const extension = path.win32.extname(command).toLowerCase();
+  if (extension !== "" && !WRAPPER_EXTENSIONS.includes(extension)) return { kind: "executable" };
+  const candidates = (base: string) => (extension ? [base] : WRAPPER_EXTENSIONS.map((suffix) => base + suffix));
+  const wrapperAt = (base: string): Found => {
+    const wrapper = candidates(base).find((candidate) => host.exists(candidate));
+    return wrapper === undefined ? { kind: "missing" } : { kind: "wrapper", path: wrapper };
+  };
+  if (/[\\/]/.test(command)) return wrapperAt(command);
+  for (const directory of (windowsEnv(env, "PATH") ?? "").split(";")) {
+    if (!directory.trim()) continue;
+    const base = path.win32.join(directory.trim().replace(/^"|"$/g, ""), command);
+    if (extension === "" && EXECUTABLE_EXTENSIONS.some((suffix) => host.exists(base + suffix))) {
+      return { kind: "executable" };
+    }
+    const found = wrapperAt(base);
+    if (found.kind === "wrapper") return found;
+  }
+  return { kind: "missing" };
+}
+
+/** Windows environment names are case-insensitive (`Path` as well as `PATH`). */
+function windowsEnv(env: Env, key: string): string | undefined {
+  for (const [name, value] of Object.entries(env)) {
+    if (name.toUpperCase() === key && value) return value;
+  }
+  return undefined;
+}

package/server/dsh-version.ts

@@ -1,4 +1,4 @@
-import { spawn } from "node:child_process";
+import { spawnDsh } from "./dsh-spawn.js";
 
 const DEFAULT_TIMEOUT_MS = 3_000;
 
@@ -41,10 +41,9 @@ function runVersionProbe(executable: string, options: DetectDshVersionOptions):
 
     let child;
     try {
-      child = spawn(executable, [...(options.args ?? []), "--version"], {
+      child = spawnDsh(executable, [...(options.args ?? []), "--version"], {
         env: options.env ?? process.env,
         stdio: ["ignore", "pipe", "ignore"],
-        windowsHide: true,
       });
     } catch {
       // Synchronous spawn failure (e.g. the executable does not exist).

package/server/provider.ts

@@ -63,6 +63,8 @@ interface DshProviderOptions {
   createBridge(launch?: SessionLaunch): Promise<DshBridge>;
   /** The `PASEO_DSH_EXECUTABLE` value; it outranks the `launch` Paseo resolves. `status()` and `createBridge` use the same precedence. */
   executable?: string;
+  /** The command registered with Paseo; defaults to `dsh` (see `defaultDshCommand`). */
+  command?: string;
   /** Detects the local dsh version for the startup compatibility check; defaults to spawning `<exe> --version`. */
   detectDshVersion?: DetectVersion;
 }
@@ -103,7 +105,7 @@ export function createDshProvider(options: DshProviderOptions): ProviderRegistra
     icon: "dsh.svg",
     getCatalogCacheKey: async (options) =>
       options.scope === "workspace" ? `dsh-pi:${options.cwd}` : "dsh-pi:global",
-    command: ["dsh"],
+    command: [options.command ?? "dsh"],
     async status(request) {
       return dshStatus(
         resolveDshLaunch(options.executable, request?.launch),
@@ -275,6 +277,15 @@ function listenToSessionBridge(
         session.dispatch.deferred = terminal;
       }
     }),
+    session.bridge.on("session.usage", ({ sessionId, usage }) => {
+      if (!isCurrentSession(sessionId)) return;
+      emit({
+        type: "session.usage",
+        sessionId: session.paseoId,
+        ...(session.activeTurnId ? { turnId: session.activeTurnId } : {}),
+        usage,
+      });
+    }),
     session.bridge.on("interaction.request", (interaction) => {
       if (!isCurrentSession(interaction.sessionId)) return;
       session.pendingInteractions.set(interaction.requestId, interaction);

package/shared/bridge-protocol.ts

@@ -208,11 +208,30 @@ export interface BridgeMethods {
   };
   "bridge.shutdown": { params: {}; result: {} };
 }
+/**
+ * One session's token and context figures, in Paseo's usage vocabulary.
+ *
+ * Field names match `ProviderUsage` so the provider forwards this straight
+ * onto `session.usage` without a second translation table.
+ */
+export interface BridgeUsage {
+  /** Uncached prompt tokens reported by the provider. */
+  inputTokens?: number;
+  /** Prompt tokens served from the provider's cache. */
+  cachedInputTokens?: number;
+  /** Completion tokens produced by the model. */
+  outputTokens?: number;
+  /** Provider-reported prompt size of the newest request. */
+  contextWindowUsedTokens?: number;
+  /** Route context capacity paired with that pressure. */
+  contextWindowMaxTokens?: number;
+}
 export interface BridgeNotifications {
   "bridge.ready": { protocolVersion: 1 };
   "session.event": { sessionId: string; event: DshSessionEvent };
   "session.stream": { sessionId: string; frame: DshStreamFrame };
   "session.status": { sessionId: string; status: "idle" | "running" };
+  "session.usage": { sessionId: string; usage: BridgeUsage };
   "interaction.request": InteractionRequest;
   "interaction.closed": { requestId: string; sessionId: string };
 }