claude-use 11.56.1 → 11.57.1

package/dist/index.cjs

@@ -198,8 +198,8 @@ var init_statusline = __esm({
     import_zod = require("zod");
     init_blank();
     init_graphemes();
-    STATUSLINE_HEADER_SEGMENTS = ["model", "provider", "route", "account", "identity", "headroom", "project", "vcs", "effort", "advisor", "version", "outputStyle"];
-    STATUSLINE_ROWS = ["context", "quota", "addedDirs", "gitFiles"];
+    STATUSLINE_HEADER_SEGMENTS = ["model", "provider", "route", "account", "identity", "headroom", "project", "vcs", "effort", "advisor", "version", "outputStyle", "cost", "dailyCost"];
+    STATUSLINE_ROWS = ["context", "quota", "addedDirs", "gitFiles", "memory", "environment"];
     STATUSLINE_COLOUR_NAMES = [
       "default",
       "dim",
@@ -290,6 +290,12 @@ var init_statusline = __esm({
         hourCycle: import_zod.z.enum(STATUSLINE_HOUR_CYCLES).describe("The hour cycle of a wall-clock time: `auto` follows the system locale, `h23` and `h24` are 24-hour time (`h24` writes midnight as 24:00), and `h12` and `h11` are 12-hour time with am or pm (`h11` writes the hour after midnight as 0)."),
         seconds: import_zod.z.boolean().describe("Whether a wall-clock time includes seconds (`14:30:07`).")
       },
+      cost: {
+        routed: import_zod.z.boolean().describe("Whether the cost segments draw for a session routed through a provider or a cloud platform's model id, where the client's own figure is not what was billed; the figure drawn is then priced from the door's usage log with `agent-shim model price`, else the client's own when it is above zero.")
+      },
+      environment: {
+        threshold: import_zod.z.number().int().min(0).describe("The fewest configuration items in total (CLAUDE.md files, rules, MCP servers and hook events) that must exist for the environment row to draw its counts.")
+      },
       colours: {
         context: colourValue.describe("The colour of the context bar and its figures below the warning threshold."),
         usage: colourValue.describe("The colour of the quota bars and their figures below the warning threshold."),
@@ -334,6 +340,8 @@ var init_statusline = __esm({
       bar: import_zod.z.strictObject(SHAPES.bar).partial().optional(),
       usage: import_zod.z.strictObject(SHAPES.usage).partial().optional(),
       clock: import_zod.z.strictObject(SHAPES.clock).partial().optional(),
+      cost: import_zod.z.strictObject(SHAPES.cost).partial().optional(),
+      environment: import_zod.z.strictObject(SHAPES.environment).partial().optional(),
       colours: import_zod.z.strictObject(SHAPES.colours).partial().optional(),
       project: import_zod.z.strictObject(SHAPES.project).partial().optional(),
       git: import_zod.z.strictObject(SHAPES.git).partial().optional(),
@@ -351,6 +359,8 @@ var init_statusline = __esm({
       bar: import_zod.z.strictObject(SHAPES.bar),
       usage: import_zod.z.strictObject(SHAPES.usage),
       clock: import_zod.z.strictObject(SHAPES.clock),
+      cost: import_zod.z.strictObject(SHAPES.cost),
+      environment: import_zod.z.strictObject(SHAPES.environment),
       colours: import_zod.z.strictObject(SHAPES.colours),
       project: import_zod.z.strictObject(SHAPES.project),
       git: import_zod.z.strictObject(SHAPES.git),
@@ -368,6 +378,8 @@ var init_statusline = __esm({
       bar: { width: 10, filled: "\u2588", empty: "\u2591" },
       usage: { value: "used", bar: true, compact: false, resetLabel: false, modelScoped: false, timeFormat: "relative", threshold: 0, sevenDayThreshold: 0 },
       clock: { hourCycle: "auto", seconds: false },
+      cost: { routed: false },
+      environment: { threshold: 0 },
       colours: {
         context: "green",
         usage: "green",
@@ -4450,7 +4462,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.56.1",
+      version: "11.57.1",
       description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
       license: "MIT",
       author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -4554,6 +4566,20 @@ var init_package = __esm({
   }
 });
 
+// src/blockingSpawn.ts
+function spawnSyncBlocking(operation, command, args, options) {
+  refuseToBlockInRole(operation);
+  return (0, import_node_child_process2.spawnSync)(command, args, options ?? {});
+}
+var import_node_child_process2;
+var init_blockingSpawn = __esm({
+  "src/blockingSpawn.ts"() {
+    "use strict";
+    import_node_child_process2 = require("node:child_process");
+    init_processRole();
+  }
+});
+
 // src/frontdoor/supervisorProcesses.ts
 function parseFrontDoorSupervisorPids(psOutput) {
   const pids = [];
@@ -5705,27 +5731,23 @@ function realIsProcessAlive(pid) {
   }
 }
 function realIsProcessZombie(pid) {
-  refuseToBlockInRole("a synchronous process-table read");
-  const result = (0, import_node_child_process2.spawnSync)("ps", ["-o", "stat=", "-p", String(pid)], { encoding: "utf8" });
+  const result = spawnSyncBlocking("a process-table read", "ps", ["-o", "stat=", "-p", String(pid)], { encoding: "utf8" });
   return result.status === 0 && result.stdout.trim().startsWith("Z");
 }
 function realIsProcessRunning(pid) {
   return realIsProcessAlive(pid) && !realIsProcessZombie(pid);
 }
 function realIsFrontDoorSupervisor(pid) {
-  refuseToBlockInRole("a synchronous process-table read");
-  const result = (0, import_node_child_process2.spawnSync)("ps", ["-o", "pid=,command=", "-p", String(pid)], { encoding: "utf8" });
+  const result = spawnSyncBlocking("a process-table read", "ps", ["-o", "pid=,command=", "-p", String(pid)], { encoding: "utf8" });
   return result.status === 0 && parseFrontDoorSupervisorPids(result.stdout).includes(pid);
 }
 function realProcessCommandLine(pid) {
-  refuseToBlockInRole("a synchronous process-table read");
-  const result = (0, import_node_child_process2.spawnSync)("ps", ["-o", "command=", "-p", String(pid)], { encoding: "utf8", timeout: PS_TIMEOUT_MS });
+  const result = spawnSyncBlocking("a process-table read", "ps", ["-o", "command=", "-p", String(pid)], { encoding: "utf8", timeout: PS_TIMEOUT_MS });
   return result.status === 0 ? result.stdout.trim() : void 0;
 }
 function realFrontDoorLiveness(pids) {
-  refuseToBlockInRole("a synchronous process-table read");
   return frontDoorLivenessOf(pids, (asked) => {
-    const result = (0, import_node_child_process2.spawnSync)("ps", ["-o", "pid=,stat=,command=", "-p", asked.map(String).join(",")], { encoding: "utf8", timeout: PS_TIMEOUT_MS });
+    const result = spawnSyncBlocking("a process-table read", "ps", ["-o", "pid=,stat=,command=", "-p", asked.map(String).join(",")], { encoding: "utf8", timeout: PS_TIMEOUT_MS });
     return { status: result.status, stdout: result.stdout, stderr: result.stderr, ...result.error === void 0 ? {} : { error: result.error } };
   });
 }
@@ -5734,7 +5756,7 @@ function expandHome2(filePath) {
 }
 function hasDesktopSession() {
   if (process.platform === "darwin") {
-    const result = (0, import_node_child_process2.spawnSync)("launchctl", ["managername"], { encoding: "utf8" });
+    const result = spawnSyncBlocking("a desktop-session check", "launchctl", ["managername"], { encoding: "utf8" });
     return result.status === 0 && result.stdout.trim() === MACOS_GUI_SESSION_MANAGER;
   }
   return hasDisplayServer();
@@ -5780,7 +5802,7 @@ function spawnDetachedDaemon(invocation, paths, subcommand, logPath) {
   import_node_fs2.default.mkdirSync(import_node_path14.default.dirname(logPath), { recursive: true });
   const logFd = import_node_fs2.default.openSync(logPath, "a");
   try {
-    const child = (0, import_node_child_process2.spawn)(invocation.command, invocation.args, detachedDaemonSpawnOptions(logFd, { ...process.env, AGENT_SHIM_HOME: paths.root }));
+    const child = (0, import_node_child_process3.spawn)(invocation.command, invocation.args, detachedDaemonSpawnOptions(logFd, { ...process.env, AGENT_SHIM_HOME: paths.root }));
     child.unref();
     if (child.pid === void 0) {
       throw new Error(`spawning ${subcommand} returned no pid`);
@@ -5930,12 +5952,13 @@ function realResolveClaudeBinary(isOwnBinary) {
 function realInstalledClaudeVersions() {
   return installedVersions(listVersionsDir(defaultVersionsDir()));
 }
-var import_node_child_process2, import_node_crypto8, import_node_fs2, import_node_os2, import_node_path14, import_node_sea, realFsPort, OWNER_ONLY_DIR_MODE, OWNER_ONLY_FILE_MODE, PERMISSION_BITS, realFarmFs, INT32_BYTE_LENGTH, KEY_POLL_MS, CTRL_C_BYTE, realHoldPort, PS_TIMEOUT_MS, realRunPort, MACOS_GUI_SESSION_MANAGER, realCredentialPort, SOCKET_PERMISSION_BITS, realHeadroomSocketTrust, realSpawnPort, realProcPort, realLogPort, EXECUTE_BITS_MASK, WINDOWS_DEFAULT_PATHEXT;
+var import_node_child_process3, import_node_crypto8, import_node_fs2, import_node_os2, import_node_path14, import_node_sea, realFsPort, OWNER_ONLY_DIR_MODE, OWNER_ONLY_FILE_MODE, PERMISSION_BITS, realFarmFs, INT32_BYTE_LENGTH, KEY_POLL_MS, CTRL_C_BYTE, realHoldPort, PS_TIMEOUT_MS, realRunPort, MACOS_GUI_SESSION_MANAGER, realCredentialPort, SOCKET_PERMISSION_BITS, realHeadroomSocketTrust, realSpawnPort, realProcPort, realLogPort, EXECUTE_BITS_MASK, WINDOWS_DEFAULT_PATHEXT;
 var init_realPorts = __esm({
   "src/realPorts.ts"() {
     "use strict";
+    init_blockingSpawn();
     init_processRole();
-    import_node_child_process2 = require("node:child_process");
+    import_node_child_process3 = require("node:child_process");
     import_node_crypto8 = require("node:crypto");
     import_node_fs2 = __toESM(require("node:fs"), 1);
     import_node_os2 = __toESM(require("node:os"), 1);
@@ -6107,7 +6130,7 @@ var init_realPorts = __esm({
     PS_TIMEOUT_MS = 2e3;
     realRunPort = {
       run(command, args) {
-        const result = (0, import_node_child_process2.spawnSync)(command, [...args], { encoding: "utf8" });
+        const result = spawnSyncBlocking("an external command", command, args, { encoding: "utf8" });
         return { status: result.status, stdout: result.stdout, stderr: result.stderr };
       }
     };
@@ -6130,7 +6153,7 @@ var init_realPorts = __esm({
       },
       runCommand(argv, options) {
         const [command, ...args] = argv;
-        const result = (0, import_node_child_process2.spawnSync)(command, args, {
+        const result = spawnSyncBlocking("a credential command", command, args, {
           encoding: "utf8",
           timeout: options.timeoutMs,
           stdio: options.interactive ? ["inherit", "pipe", "inherit"] : ["ignore", "pipe", "pipe"]
@@ -6169,7 +6192,7 @@ var init_realPorts = __esm({
     };
     realSpawnPort = {
       spawnSync(command, args, options) {
-        const result = (0, import_node_child_process2.spawnSync)(command, args, options);
+        const result = spawnSyncBlocking("a spawned program", command, args, options);
         return { status: result.status, signal: result.signal, ...result.error === void 0 ? {} : { error: result.error } };
       }
     };
@@ -6391,7 +6414,7 @@ var init_identity = __esm({
 });
 
 // src/usage/schema.ts
-var import_zod11, USAGE_SCHEMA_VERSION, VersionSchema, InstantSchema, TokenCountSchema, TokenUsageSchema, LIMIT_KINDS, LimitClassificationSchema, UsageRecordSchema, QuotaWindowSchema, ExtraUsageSpendSchema, UnifiedRateLimitSchema, RateLimitStateSchema, LimitEventSchema, ProviderQuotaWindowSchema, ProviderAccountSchema, ProviderQuotaSchema, ProviderUsageStateSchema, AccountMetadataSchema, UsageSnapshotSchema;
+var import_zod11, USAGE_SCHEMA_VERSION, VersionSchema, InstantSchema, CLIENT_SESSION_ID_PATTERN, TokenCountSchema, TokenUsageSchema, LIMIT_KINDS, LimitClassificationSchema, UsageRecordSchema, QuotaWindowSchema, ExtraUsageSpendSchema, UnifiedRateLimitSchema, RateLimitStateSchema, LimitEventSchema, ProviderQuotaWindowSchema, ProviderAccountSchema, ProviderQuotaSchema, ProviderUsageStateSchema, AccountMetadataSchema, UsageSnapshotSchema;
 var init_schema2 = __esm({
   "src/usage/schema.ts"() {
     "use strict";
@@ -6399,6 +6422,7 @@ var init_schema2 = __esm({
     USAGE_SCHEMA_VERSION = 1;
     VersionSchema = import_zod11.z.literal(USAGE_SCHEMA_VERSION);
     InstantSchema = import_zod11.z.iso.datetime();
+    CLIENT_SESSION_ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
     TokenCountSchema = import_zod11.z.number().int().nonnegative();
     TokenUsageSchema = import_zod11.z.strictObject({
       inputTokens: TokenCountSchema.optional(),
@@ -6428,6 +6452,8 @@ var init_schema2 = __esm({
       provider: import_zod11.z.string(),
       /** The launch's session id, generated per launch. */
       sessionId: import_zod11.z.string().optional(),
+      /** The client's own id for the conversation, from the request's `x-claude-code-session-id` header: it changes when the conversation is cleared inside one launch, which `sessionId` does not, so it is what ties a request to the client's per-conversation figures. Absent when the client sent none. */
+      clientSessionId: import_zod11.z.string().regex(CLIENT_SESSION_ID_PATTERN).optional(),
       /** The project the launch ran in (its git repository root), when the launch sent one: headroom launches do. */
       project: import_zod11.z.string().optional(),
       /** Whether the request crossed headroom on its way upstream. Absent on a record written before the door recorded it, and false when the request went direct. */
@@ -7983,6 +8009,7 @@ function buildLayoutPaths(root) {
     usageDir: import_node_path23.default.join(root, "usage"),
     usageLogDir: import_node_path23.default.join(root, "usage", "log"),
     usageSnapshotsDir: import_node_path23.default.join(root, "usage", "snapshots"),
+    statuslineDir: import_node_path23.default.join(root, "statusline"),
     catalogueDir: import_node_path23.default.join(root, "catalogues"),
     usagePicksFile: import_node_path23.default.join(root, "usage", "picks.json"),
     usageAnchorsFile: import_node_path23.default.join(root, "usage", "anchors.json"),
@@ -8103,7 +8130,7 @@ function requireKeychain() {
   }
 }
 function security(args, stdin) {
-  const result = (0, import_node_child_process3.spawnSync)("security", args, { encoding: "utf8", ...stdin === void 0 ? {} : { input: stdin }, stdio: ["pipe", "pipe", "ignore"] });
+  const result = spawnSyncBlocking("a keychain call", "security", args, { encoding: "utf8", ...stdin === void 0 ? {} : { input: stdin }, stdio: ["pipe", "pipe", "ignore"] });
   return { status: result.status, stdout: result.stdout };
 }
 function createRealCredentialCache(root) {
@@ -8154,13 +8181,13 @@ function createRealCredentialCache(root) {
 function realCredentialCacheEnv(paths) {
   return { port: createRealCredentialCache(paths.root), platform: process.platform, now: () => Date.now() };
 }
-var import_node_child_process3, import_node_fs5, import_node_path24, KEYCHAIN_CACHE_SERVICE, CACHE_DIR_MODE, CACHE_FILE_MODE;
+var import_node_fs5, import_node_path24, KEYCHAIN_CACHE_SERVICE, CACHE_DIR_MODE, CACHE_FILE_MODE;
 var init_realCredentialCache = __esm({
   "src/realCredentialCache.ts"() {
     "use strict";
-    import_node_child_process3 = require("node:child_process");
     import_node_fs5 = __toESM(require("node:fs"), 1);
     import_node_path24 = __toESM(require("node:path"), 1);
+    init_blockingSpawn();
     init_credentialCache();
     KEYCHAIN_CACHE_SERVICE = "agent-shim-credential-cache";
     CACHE_DIR_MODE = 448;
@@ -11527,13 +11554,13 @@ function resolveLaunch(params) {
     environment
   };
 }
-function runLaunchPlan(plan, spawn4) {
+function runLaunchPlan(plan, spawn3) {
   try {
     if (plan.hold() === "cancelled") {
       return LAUNCH_CANCELLED_EXIT;
     }
     plan.markChildStarted();
-    const result = spawn4.spawnSync(plan.bin, plan.args, { stdio: "inherit", env: plan.env });
+    const result = spawn3.spawnSync(plan.bin, plan.args, { stdio: "inherit", env: plan.env });
     if (result.error !== void 0) {
       throw result.error;
     }
@@ -11743,14 +11770,21 @@ var init_realFrontDoorPort = __esm({
   }
 });
 
+// src/replayRun.ts
+var init_replayRun = __esm({
+  "src/replayRun.ts"() {
+    "use strict";
+  }
+});
+
 // src/launchWiring.ts
-function buildFarmRuntime(paths, cwd) {
+function buildFarmRuntime(paths, cwd, run = realRunPort) {
   const home = import_node_os7.default.homedir();
   const read = cosmiconfigReader();
   const classification = loadClassification(paths);
   const loaded = loadCascadeInput({ paths, home, cwd, read });
   const selections = readDirectorySelections(loaded);
-  const git = resolveGitBranch(realRunPort, cwd);
+  const git = resolveGitBranch(run, cwd);
   const updateMode = resolveUpdateMode(loaded.globalConfig);
   return {
     runtime: {
@@ -11797,7 +11831,7 @@ function realPrepareLaunchParams(paths, options) {
     frontdoor: realFrontDoorPort(paths, options.spawnDaemon),
     credentials: { ...realCredentialPort, cache: realCredentialCacheEnv(paths) },
     hold: realHoldPort,
-    hasStoredLogin: (identity) => identitySignIn(realFarmFs, { platform: process.platform, run: realRunPort }, { farmRoot: import_node_path42.default.join(paths.identitiesDir, identity), hasCredentialBlock: false }).state !== "signed-out",
+    hasStoredLogin: (identity) => identitySignIn(realFarmFs, { platform: process.platform, run: options.run ?? realRunPort }, { farmRoot: import_node_path42.default.join(paths.identitiesDir, identity), hasCredentialBlock: false }).state !== "signed-out",
     ...farm.directoryIdentity === void 0 ? {} : { directoryPinnedIdentity: farm.directoryIdentity },
     ...farm.directoryConfigProfile === void 0 ? {} : { directoryRuleConfigProfile: farm.directoryConfigProfile },
     ...farm.globalDefaultConfigProfile === void 0 ? {} : { globalDefaultConfigProfile: farm.globalDefaultConfigProfile },
@@ -11830,7 +11864,7 @@ function prepareClaudeLaunch(options) {
   const spawnDaemon = daemonSpawnerFor(options.agentShim);
   return prepareLaunch(realPrepareLaunchParams(paths, { proc, log, spawnDaemon, farm: buildFarmRuntime(paths, options.cwd) }));
 }
-function resolveClaudeLaunch(options) {
+function resolveClaudeLaunch(options, run = realRunPort) {
   const paths = options.paths ?? resolveLayoutPaths();
   const refusals = [];
   const warnings = [];
@@ -11854,7 +11888,7 @@ function resolveClaudeLaunch(options) {
   const spawnDaemon = () => {
     throw new Error("resolving a launch starts no daemon");
   };
-  return { resolution: resolveLaunch(realPrepareLaunchParams(paths, { proc, log, spawnDaemon, farm: buildFarmRuntime(paths, options.cwd) })), warnings };
+  return { resolution: resolveLaunch(realPrepareLaunchParams(paths, { proc, log, spawnDaemon, run, farm: buildFarmRuntime(paths, options.cwd, run) })), warnings };
 }
 var import_node_os7, import_node_path42, import_node_crypto13, LaunchRefusedError;
 var init_launchWiring = __esm({
@@ -11873,6 +11907,7 @@ var init_launchWiring = __esm({
     init_launcher();
     init_launchHook();
     init_cascade();
+    init_replayRun();
     init_paths();
     init_signIn();
     init_realPorts();
@@ -18297,9 +18332,9 @@ function createLaunchApiRouter(deps) {
           // A POST because the launch's environment and arguments are a body, but the answer changes nothing.
           spec: (current) => ({ ...current, [READ_ONLY_OPERATION_EXTENSION]: true })
         })
-      ).input(LaunchResolveInputSchema).output(LaunchResolveOutputSchema).handler(({ input }) => {
+      ).input(LaunchResolveInputSchema).output(LaunchResolveOutputSchema).handler(async ({ input }) => {
         try {
-          const { resolution, warnings } = deps.resolveLaunch({ path: input.path, argv: input.argv ?? [], env: input.env ?? {} });
+          const { resolution, warnings } = await deps.resolveLaunch({ path: input.path, argv: input.argv ?? [], env: input.env ?? {} });
           return { ...resolution, warnings };
         } catch (error) {
           if (error instanceof CliError) {

package/dist/index.mjs

@@ -176,8 +176,8 @@ var init_statusline = __esm({
     "use strict";
     init_blank();
     init_graphemes();
-    STATUSLINE_HEADER_SEGMENTS = ["model", "provider", "route", "account", "identity", "headroom", "project", "vcs", "effort", "advisor", "version", "outputStyle"];
-    STATUSLINE_ROWS = ["context", "quota", "addedDirs", "gitFiles"];
+    STATUSLINE_HEADER_SEGMENTS = ["model", "provider", "route", "account", "identity", "headroom", "project", "vcs", "effort", "advisor", "version", "outputStyle", "cost", "dailyCost"];
+    STATUSLINE_ROWS = ["context", "quota", "addedDirs", "gitFiles", "memory", "environment"];
     STATUSLINE_COLOUR_NAMES = [
       "default",
       "dim",
@@ -268,6 +268,12 @@ var init_statusline = __esm({
         hourCycle: z.enum(STATUSLINE_HOUR_CYCLES).describe("The hour cycle of a wall-clock time: `auto` follows the system locale, `h23` and `h24` are 24-hour time (`h24` writes midnight as 24:00), and `h12` and `h11` are 12-hour time with am or pm (`h11` writes the hour after midnight as 0)."),
         seconds: z.boolean().describe("Whether a wall-clock time includes seconds (`14:30:07`).")
       },
+      cost: {
+        routed: z.boolean().describe("Whether the cost segments draw for a session routed through a provider or a cloud platform's model id, where the client's own figure is not what was billed; the figure drawn is then priced from the door's usage log with `agent-shim model price`, else the client's own when it is above zero.")
+      },
+      environment: {
+        threshold: z.number().int().min(0).describe("The fewest configuration items in total (CLAUDE.md files, rules, MCP servers and hook events) that must exist for the environment row to draw its counts.")
+      },
       colours: {
         context: colourValue.describe("The colour of the context bar and its figures below the warning threshold."),
         usage: colourValue.describe("The colour of the quota bars and their figures below the warning threshold."),
@@ -312,6 +318,8 @@ var init_statusline = __esm({
       bar: z.strictObject(SHAPES.bar).partial().optional(),
       usage: z.strictObject(SHAPES.usage).partial().optional(),
       clock: z.strictObject(SHAPES.clock).partial().optional(),
+      cost: z.strictObject(SHAPES.cost).partial().optional(),
+      environment: z.strictObject(SHAPES.environment).partial().optional(),
       colours: z.strictObject(SHAPES.colours).partial().optional(),
       project: z.strictObject(SHAPES.project).partial().optional(),
       git: z.strictObject(SHAPES.git).partial().optional(),
@@ -329,6 +337,8 @@ var init_statusline = __esm({
       bar: z.strictObject(SHAPES.bar),
       usage: z.strictObject(SHAPES.usage),
       clock: z.strictObject(SHAPES.clock),
+      cost: z.strictObject(SHAPES.cost),
+      environment: z.strictObject(SHAPES.environment),
       colours: z.strictObject(SHAPES.colours),
       project: z.strictObject(SHAPES.project),
       git: z.strictObject(SHAPES.git),
@@ -346,6 +356,8 @@ var init_statusline = __esm({
       bar: { width: 10, filled: "\u2588", empty: "\u2591" },
       usage: { value: "used", bar: true, compact: false, resetLabel: false, modelScoped: false, timeFormat: "relative", threshold: 0, sevenDayThreshold: 0 },
       clock: { hourCycle: "auto", seconds: false },
+      cost: { routed: false },
+      environment: { threshold: 0 },
       colours: {
         context: "green",
         usage: "green",
@@ -4426,7 +4438,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "claude-use",
-      version: "11.56.1",
+      version: "11.57.1",
       description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
       license: "MIT",
       author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -4530,6 +4542,22 @@ var init_package = __esm({
   }
 });
 
+// src/blockingSpawn.ts
+import {
+  execFileSync,
+  spawnSync
+} from "node:child_process";
+function spawnSyncBlocking(operation, command, args, options) {
+  refuseToBlockInRole(operation);
+  return spawnSync(command, args, options ?? {});
+}
+var init_blockingSpawn = __esm({
+  "src/blockingSpawn.ts"() {
+    "use strict";
+    init_processRole();
+  }
+});
+
 // src/frontdoor/supervisorProcesses.ts
 function parseFrontDoorSupervisorPids(psOutput) {
   const pids = [];
@@ -5661,7 +5689,7 @@ var init_logStyle = __esm({
 });
 
 // src/realPorts.ts
-import { execFile, spawn as spawn2, spawnSync } from "node:child_process";
+import { execFile, spawn as spawn2 } from "node:child_process";
 import { createHash as createHash5 } from "node:crypto";
 import fs3 from "node:fs";
 import os3 from "node:os";
@@ -5686,27 +5714,23 @@ function realIsProcessAlive(pid) {
   }
 }
 function realIsProcessZombie(pid) {
-  refuseToBlockInRole("a synchronous process-table read");
-  const result = spawnSync("ps", ["-o", "stat=", "-p", String(pid)], { encoding: "utf8" });
+  const result = spawnSyncBlocking("a process-table read", "ps", ["-o", "stat=", "-p", String(pid)], { encoding: "utf8" });
   return result.status === 0 && result.stdout.trim().startsWith("Z");
 }
 function realIsProcessRunning(pid) {
   return realIsProcessAlive(pid) && !realIsProcessZombie(pid);
 }
 function realIsFrontDoorSupervisor(pid) {
-  refuseToBlockInRole("a synchronous process-table read");
-  const result = spawnSync("ps", ["-o", "pid=,command=", "-p", String(pid)], { encoding: "utf8" });
+  const result = spawnSyncBlocking("a process-table read", "ps", ["-o", "pid=,command=", "-p", String(pid)], { encoding: "utf8" });
   return result.status === 0 && parseFrontDoorSupervisorPids(result.stdout).includes(pid);
 }
 function realProcessCommandLine(pid) {
-  refuseToBlockInRole("a synchronous process-table read");
-  const result = spawnSync("ps", ["-o", "command=", "-p", String(pid)], { encoding: "utf8", timeout: PS_TIMEOUT_MS });
+  const result = spawnSyncBlocking("a process-table read", "ps", ["-o", "command=", "-p", String(pid)], { encoding: "utf8", timeout: PS_TIMEOUT_MS });
   return result.status === 0 ? result.stdout.trim() : void 0;
 }
 function realFrontDoorLiveness(pids) {
-  refuseToBlockInRole("a synchronous process-table read");
   return frontDoorLivenessOf(pids, (asked) => {
-    const result = spawnSync("ps", ["-o", "pid=,stat=,command=", "-p", asked.map(String).join(",")], { encoding: "utf8", timeout: PS_TIMEOUT_MS });
+    const result = spawnSyncBlocking("a process-table read", "ps", ["-o", "pid=,stat=,command=", "-p", asked.map(String).join(",")], { encoding: "utf8", timeout: PS_TIMEOUT_MS });
     return { status: result.status, stdout: result.stdout, stderr: result.stderr, ...result.error === void 0 ? {} : { error: result.error } };
   });
 }
@@ -5715,7 +5739,7 @@ function expandHome2(filePath) {
 }
 function hasDesktopSession() {
   if (process.platform === "darwin") {
-    const result = spawnSync("launchctl", ["managername"], { encoding: "utf8" });
+    const result = spawnSyncBlocking("a desktop-session check", "launchctl", ["managername"], { encoding: "utf8" });
     return result.status === 0 && result.stdout.trim() === MACOS_GUI_SESSION_MANAGER;
   }
   return hasDisplayServer();
@@ -5915,6 +5939,7 @@ var realFsPort, OWNER_ONLY_DIR_MODE, OWNER_ONLY_FILE_MODE, PERMISSION_BITS, real
 var init_realPorts = __esm({
   "src/realPorts.ts"() {
     "use strict";
+    init_blockingSpawn();
     init_processRole();
     init_load();
     init_versionDiscovery();
@@ -6082,7 +6107,7 @@ var init_realPorts = __esm({
     PS_TIMEOUT_MS = 2e3;
     realRunPort = {
       run(command, args) {
-        const result = spawnSync(command, [...args], { encoding: "utf8" });
+        const result = spawnSyncBlocking("an external command", command, args, { encoding: "utf8" });
         return { status: result.status, stdout: result.stdout, stderr: result.stderr };
       }
     };
@@ -6105,7 +6130,7 @@ var init_realPorts = __esm({
       },
       runCommand(argv, options) {
         const [command, ...args] = argv;
-        const result = spawnSync(command, args, {
+        const result = spawnSyncBlocking("a credential command", command, args, {
           encoding: "utf8",
           timeout: options.timeoutMs,
           stdio: options.interactive ? ["inherit", "pipe", "inherit"] : ["ignore", "pipe", "pipe"]
@@ -6144,7 +6169,7 @@ var init_realPorts = __esm({
     };
     realSpawnPort = {
       spawnSync(command, args, options) {
-        const result = spawnSync(command, args, options);
+        const result = spawnSyncBlocking("a spawned program", command, args, options);
         return { status: result.status, signal: result.signal, ...result.error === void 0 ? {} : { error: result.error } };
       }
     };
@@ -6366,13 +6391,14 @@ var init_identity = __esm({
 
 // src/usage/schema.ts
 import { z as z11 } from "zod";
-var USAGE_SCHEMA_VERSION, VersionSchema, InstantSchema, TokenCountSchema, TokenUsageSchema, LIMIT_KINDS, LimitClassificationSchema, UsageRecordSchema, QuotaWindowSchema, ExtraUsageSpendSchema, UnifiedRateLimitSchema, RateLimitStateSchema, LimitEventSchema, ProviderQuotaWindowSchema, ProviderAccountSchema, ProviderQuotaSchema, ProviderUsageStateSchema, AccountMetadataSchema, UsageSnapshotSchema;
+var USAGE_SCHEMA_VERSION, VersionSchema, InstantSchema, CLIENT_SESSION_ID_PATTERN, TokenCountSchema, TokenUsageSchema, LIMIT_KINDS, LimitClassificationSchema, UsageRecordSchema, QuotaWindowSchema, ExtraUsageSpendSchema, UnifiedRateLimitSchema, RateLimitStateSchema, LimitEventSchema, ProviderQuotaWindowSchema, ProviderAccountSchema, ProviderQuotaSchema, ProviderUsageStateSchema, AccountMetadataSchema, UsageSnapshotSchema;
 var init_schema2 = __esm({
   "src/usage/schema.ts"() {
     "use strict";
     USAGE_SCHEMA_VERSION = 1;
     VersionSchema = z11.literal(USAGE_SCHEMA_VERSION);
     InstantSchema = z11.iso.datetime();
+    CLIENT_SESSION_ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/;
     TokenCountSchema = z11.number().int().nonnegative();
     TokenUsageSchema = z11.strictObject({
       inputTokens: TokenCountSchema.optional(),
@@ -6402,6 +6428,8 @@ var init_schema2 = __esm({
       provider: z11.string(),
       /** The launch's session id, generated per launch. */
       sessionId: z11.string().optional(),
+      /** The client's own id for the conversation, from the request's `x-claude-code-session-id` header: it changes when the conversation is cleared inside one launch, which `sessionId` does not, so it is what ties a request to the client's per-conversation figures. Absent when the client sent none. */
+      clientSessionId: z11.string().regex(CLIENT_SESSION_ID_PATTERN).optional(),
       /** The project the launch ran in (its git repository root), when the launch sent one: headroom launches do. */
       project: z11.string().optional(),
       /** Whether the request crossed headroom on its way upstream. Absent on a record written before the door recorded it, and false when the request went direct. */
@@ -7959,6 +7987,7 @@ function buildLayoutPaths(root) {
     usageDir: path23.join(root, "usage"),
     usageLogDir: path23.join(root, "usage", "log"),
     usageSnapshotsDir: path23.join(root, "usage", "snapshots"),
+    statuslineDir: path23.join(root, "statusline"),
     catalogueDir: path23.join(root, "catalogues"),
     usagePicksFile: path23.join(root, "usage", "picks.json"),
     usageAnchorsFile: path23.join(root, "usage", "anchors.json"),
@@ -8056,7 +8085,6 @@ var init_credentialCache = __esm({
 });
 
 // src/realCredentialCache.ts
-import { spawn as spawn3, spawnSync as spawnSync2 } from "node:child_process";
 import fs6 from "node:fs";
 import path24 from "node:path";
 function cacheFileNameFor(owner) {
@@ -8078,7 +8106,7 @@ function requireKeychain() {
   }
 }
 function security(args, stdin) {
-  const result = spawnSync2("security", args, { encoding: "utf8", ...stdin === void 0 ? {} : { input: stdin }, stdio: ["pipe", "pipe", "ignore"] });
+  const result = spawnSyncBlocking("a keychain call", "security", args, { encoding: "utf8", ...stdin === void 0 ? {} : { input: stdin }, stdio: ["pipe", "pipe", "ignore"] });
   return { status: result.status, stdout: result.stdout };
 }
 function createRealCredentialCache(root) {
@@ -8133,6 +8161,7 @@ var KEYCHAIN_CACHE_SERVICE, CACHE_DIR_MODE, CACHE_FILE_MODE;
 var init_realCredentialCache = __esm({
   "src/realCredentialCache.ts"() {
     "use strict";
+    init_blockingSpawn();
     init_credentialCache();
     KEYCHAIN_CACHE_SERVICE = "agent-shim-credential-cache";
     CACHE_DIR_MODE = 448;
@@ -11501,13 +11530,13 @@ function resolveLaunch(params) {
     environment
   };
 }
-function runLaunchPlan(plan, spawn4) {
+function runLaunchPlan(plan, spawn3) {
   try {
     if (plan.hold() === "cancelled") {
       return LAUNCH_CANCELLED_EXIT;
     }
     plan.markChildStarted();
-    const result = spawn4.spawnSync(plan.bin, plan.args, { stdio: "inherit", env: plan.env });
+    const result = spawn3.spawnSync(plan.bin, plan.args, { stdio: "inherit", env: plan.env });
     if (result.error !== void 0) {
       throw result.error;
     }
@@ -11712,17 +11741,24 @@ var init_realFrontDoorPort = __esm({
   }
 });
 
+// src/replayRun.ts
+var init_replayRun = __esm({
+  "src/replayRun.ts"() {
+    "use strict";
+  }
+});
+
 // src/launchWiring.ts
 import os8 from "node:os";
 import path42 from "node:path";
 import { randomUUID as randomUUID5 } from "node:crypto";
-function buildFarmRuntime(paths, cwd) {
+function buildFarmRuntime(paths, cwd, run = realRunPort) {
   const home = os8.homedir();
   const read = cosmiconfigReader();
   const classification = loadClassification(paths);
   const loaded = loadCascadeInput({ paths, home, cwd, read });
   const selections = readDirectorySelections(loaded);
-  const git = resolveGitBranch(realRunPort, cwd);
+  const git = resolveGitBranch(run, cwd);
   const updateMode = resolveUpdateMode(loaded.globalConfig);
   return {
     runtime: {
@@ -11769,7 +11805,7 @@ function realPrepareLaunchParams(paths, options) {
     frontdoor: realFrontDoorPort(paths, options.spawnDaemon),
     credentials: { ...realCredentialPort, cache: realCredentialCacheEnv(paths) },
     hold: realHoldPort,
-    hasStoredLogin: (identity) => identitySignIn(realFarmFs, { platform: process.platform, run: realRunPort }, { farmRoot: path42.join(paths.identitiesDir, identity), hasCredentialBlock: false }).state !== "signed-out",
+    hasStoredLogin: (identity) => identitySignIn(realFarmFs, { platform: process.platform, run: options.run ?? realRunPort }, { farmRoot: path42.join(paths.identitiesDir, identity), hasCredentialBlock: false }).state !== "signed-out",
     ...farm.directoryIdentity === void 0 ? {} : { directoryPinnedIdentity: farm.directoryIdentity },
     ...farm.directoryConfigProfile === void 0 ? {} : { directoryRuleConfigProfile: farm.directoryConfigProfile },
     ...farm.globalDefaultConfigProfile === void 0 ? {} : { globalDefaultConfigProfile: farm.globalDefaultConfigProfile },
@@ -11802,7 +11838,7 @@ function prepareClaudeLaunch(options) {
   const spawnDaemon = daemonSpawnerFor(options.agentShim);
   return prepareLaunch(realPrepareLaunchParams(paths, { proc, log, spawnDaemon, farm: buildFarmRuntime(paths, options.cwd) }));
 }
-function resolveClaudeLaunch(options) {
+function resolveClaudeLaunch(options, run = realRunPort) {
   const paths = options.paths ?? resolveLayoutPaths();
   const refusals = [];
   const warnings = [];
@@ -11826,7 +11862,7 @@ function resolveClaudeLaunch(options) {
   const spawnDaemon = () => {
     throw new Error("resolving a launch starts no daemon");
   };
-  return { resolution: resolveLaunch(realPrepareLaunchParams(paths, { proc, log, spawnDaemon, farm: buildFarmRuntime(paths, options.cwd) })), warnings };
+  return { resolution: resolveLaunch(realPrepareLaunchParams(paths, { proc, log, spawnDaemon, run, farm: buildFarmRuntime(paths, options.cwd, run) })), warnings };
 }
 var LaunchRefusedError;
 var init_launchWiring = __esm({
@@ -11842,6 +11878,7 @@ var init_launchWiring = __esm({
     init_launcher();
     init_launchHook();
     init_cascade();
+    init_replayRun();
     init_paths();
     init_signIn();
     init_realPorts();
@@ -17882,9 +17919,9 @@ function createLaunchApiRouter(deps) {
           // A POST because the launch's environment and arguments are a body, but the answer changes nothing.
           spec: (current) => ({ ...current, [READ_ONLY_OPERATION_EXTENSION]: true })
         })
-      ).input(LaunchResolveInputSchema).output(LaunchResolveOutputSchema).handler(({ input }) => {
+      ).input(LaunchResolveInputSchema).output(LaunchResolveOutputSchema).handler(async ({ input }) => {
         try {
-          const { resolution, warnings } = deps.resolveLaunch({ path: input.path, argv: input.argv ?? [], env: input.env ?? {} });
+          const { resolution, warnings } = await deps.resolveLaunch({ path: input.path, argv: input.argv ?? [], env: input.env ?? {} });
           return { ...resolution, warnings };
         } catch (error) {
           if (error instanceof CliError) {