chainlesschain 0.166.13 → 0.166.14

package/src/commands/agent.js

@@ -30,6 +30,8 @@ import {
   transformBackgroundLaunchArgv,
 } from "../lib/background-command-argv.js";
 import { resolveSessionBudgetRootOptions } from "../lib/session-budget-production-root.js";
+import { withQuietStdout } from "../runtime/quiet-stdout.js";
+import { resolveCredentialEnvironmentValue } from "../lib/process-execution-broker/credential-transport.js";
 import {
   captureClaudeStorageLaunchEnvironment,
   restoreClaudeStorageLaunchEnvironment,
@@ -352,11 +354,11 @@ export function registerAgentCommand(program) {
     )
     .option(
       "--sandbox [image]",
-      "Select the sandbox image/engine configuration (workspace-write and network-off are the default posture)",
+      "Run shell commands in an ephemeral Docker sandbox (network disabled by default)",
     )
     .option(
       "--sandbox-mode <mode>",
-      "Sandbox posture: off | workspace-write | strict (default: workspace-write; isolation modes fail closed)",
+      "Sandbox posture: off | workspace-write | strict (explicit isolation modes fail closed)",
     )
     .option("--sandbox-network", "Allow network access inside --sandbox")
     .option(
@@ -683,8 +685,19 @@ export function registerAgentCommand(program) {
       // scripts) pass the key via the environment instead of argv, where it
       // is visible to every local process (/proc/<pid>/cmdline, Win32_Process).
       // An explicit --api-key still wins.
-      if (!options.apiKey && process.env.CC_API_KEY) {
-        options.apiKey = process.env.CC_API_KEY;
+      if (!options.apiKey) {
+        try {
+          options.apiKey =
+            (await resolveCredentialEnvironmentValue("CC_API_KEY", {
+              env: process.env,
+            })) || undefined;
+        } catch (error) {
+          process.stderr.write(
+            `Error: brokered API credential is unavailable (${error.code || "CC_CREDENTIAL_TRANSPORT_UNAVAILABLE"})\n`,
+          );
+          process.exitCode = 1;
+          return;
+        }
       } else if (
         options.apiKey &&
         containsApiKeyArgument(process.argv) &&
@@ -1016,26 +1029,32 @@ export function registerAgentCommand(program) {
       // conversation merely because their reader is JSONL-backed.
       const resumeRequested = Boolean(options.session);
       if (resumeRequested && options.session) {
-        const { sessionHasPersistedEvidence } =
-          await import("../harness/jsonl-session-store.js");
-        if (!sessionHasPersistedEvidence(options.session)) {
-          const [{ bootstrap }, { ensureCanonicalSessionFromDatabase }] =
-            await Promise.all([
-              import("../runtime/bootstrap.js"),
-              import("../lib/session-transcript-migration.js"),
-            ]);
-          const context =
-            sessionBootstrapContext ||
-            (await bootstrap({ verbose: program.opts().verbose }));
-          sessionBootstrapContext = context;
-          const database =
-            context.db?.getDatabase?.() || context.db?.getDb?.() || null;
-          const migrated = ensureCanonicalSessionFromDatabase(
-            database,
-            options.session,
-          );
-          if (migrated?.sessionId) options.session = migrated.sessionId;
-        }
+        // Importing the persistent store and falling back to SQLite can lazily
+        // initialize AppConfig/DatabaseManager. Their legacy console.info
+        // diagnostics belong on stderr; stdout may already be reserved for a
+        // JSON/NDJSON protocol selected by this command.
+        await withQuietStdout(async () => {
+          const { sessionHasPersistedEvidence } =
+            await import("../harness/jsonl-session-store.js");
+          if (!sessionHasPersistedEvidence(options.session)) {
+            const [{ bootstrap }, { ensureCanonicalSessionFromDatabase }] =
+              await Promise.all([
+                import("../runtime/bootstrap.js"),
+                import("../lib/session-transcript-migration.js"),
+              ]);
+            const context =
+              sessionBootstrapContext ||
+              (await bootstrap({ verbose: program.opts().verbose }));
+            sessionBootstrapContext = context;
+            const database =
+              context.db?.getDatabase?.() || context.db?.getDb?.() || null;
+            const migrated = ensureCanonicalSessionFromDatabase(
+              database,
+              options.session,
+            );
+            if (migrated?.sessionId) options.session = migrated.sessionId;
+          }
+        });
       }
 
       // --fork-session: branch the resolved session into a NEW id so the
@@ -1630,9 +1649,12 @@ export function registerAgentCommand(program) {
         // contained the requested logical session, warn instead of silently
         // presenting a fresh conversation as a successful resume.
         if (resumeRequested && options.session) {
-          const { sessionHasPersistedEvidence } =
-            await import("../harness/jsonl-session-store.js");
-          if (!sessionHasPersistedEvidence(options.session)) {
+          const hasPersistedEvidence = await withQuietStdout(async () => {
+            const { sessionHasPersistedEvidence } =
+              await import("../harness/jsonl-session-store.js");
+            return sessionHasPersistedEvidence(options.session);
+          });
+          if (!hasPersistedEvidence) {
             process.stderr.write(
               `Note: no persisted transcript for session "${options.session}"; ` +
                 "starting fresh because no readable physical adapter contains it.\n",