@prestyj/cli 5.30.3 → 5.32.0

package/dist/core/agent-session.js

@@ -5,10 +5,10 @@ import { flagUntrustedToolResult } from "./injection-detect.js";
 import { COMPLETION_REVIEW_STATE_KIND, } from "./completion-review.js";
 import { SlashCommandRegistry, createBuiltinCommands, } from "./slash-commands.js";
 import { PROMPT_COMMANDS, getPromptCommand } from "./prompt-commands.js";
-import { loadCustomCommands } from "./custom-commands.js";
+import { loadWorkspaceCustomCommands } from "./custom-commands.js";
 import { expandPromptCommand } from "./prompt-command-expansion.js";
 import { SettingsManager } from "./settings-manager.js";
-import { AuthStorage } from "./auth-storage.js";
+import { AuthStorage, NotLoggedInError } from "./auth-storage.js";
 import { dualAuthProvider } from "@prestyj/core";
 import { getClaudeCliUserAgent, recordRequiredClaudeCodeVersion } from "./claude-code-version.js";
 import { kimiCodingHeaders, isKimiCodingEndpoint } from "./oauth/kimi.js";
@@ -561,7 +561,6 @@ export class AgentSession {
             const helpCmd = this.slashCommands.get("help");
             if (helpCmd) {
                 const registry = this.slashCommands;
-                const cwd = this.cwd;
                 helpCmd.execute = async () => {
                     const all = registry.getAll();
                     const lines = all.map((c) => `  /${c.name}${c.aliases.length ? ` (${c.aliases.map((a) => "/" + a).join(", ")})` : ""} — ${c.description}`);
@@ -571,7 +570,7 @@ export class AgentSession {
                             lines.push(`  /${cmd.name}${cmd.aliases.length ? ` (${cmd.aliases.map((a) => "/" + a).join(", ")})` : ""} — ${cmd.description}`);
                         }
                     }
-                    const customCmds = await loadCustomCommands(cwd);
+                    const customCmds = await this.loadCustomCommands();
                     if (customCmds.length > 0) {
                         lines.push("", "Custom commands:");
                         for (const cmd of customCmds)
@@ -779,7 +778,7 @@ export class AgentSession {
             return null;
         // EZ Coder alone can resolve its prompt-template and project commands.
         const builtinPromptCmd = coderCommands ? getPromptCommand(parsed.name) : undefined;
-        const customCmds = coderCommands ? await loadCustomCommands(this.cwd) : [];
+        const customCmds = coderCommands ? await this.loadCustomCommands() : [];
         const customPromptCmd = !builtinPromptCmd
             ? customCmds.find((c) => c.name === parsed.name)
             : undefined;
@@ -1512,12 +1511,27 @@ export class AgentSession {
     async runLoop(options = {}) {
         this.prewarmController?.abort();
         this.runLoopDepth++;
+        if (this.runLoopDepth === 1)
+            this.notifyRunActive(true);
         try {
             await this.runLoopInner(options);
         }
         finally {
             this.runLoopDepth--;
             this.lastRealRequestAt = Date.now();
+            if (this.runLoopDepth === 0)
+                this.notifyRunActive(false);
+        }
+    }
+    /** `opts.onRunActive`, never allowed to throw into the run. */
+    notifyRunActive(active) {
+        try {
+            this.opts.onRunActive?.(active);
+        }
+        catch (err) {
+            log("WARN", "session", "onRunActive listener threw", {
+                message: err instanceof Error ? err.message : String(err),
+            });
         }
     }
     /** Auto-compact if needed, run agent loop with auth retry, and persist messages. */
@@ -2838,6 +2852,14 @@ export class AgentSession {
     getAdditionalRoots() {
         return [...this.additionalRoots];
     }
+    /**
+     * The custom `.ezcoder/commands` slash commands this session can run: the
+     * project's, then those of every added root (a goal's attached repos too).
+     * Read fresh, so a new command file is picked up without a restart.
+     */
+    loadCustomCommands() {
+        return loadWorkspaceCustomCommands([this.cwd, ...this.additionalRoots]);
+    }
     /**
      * Add another workspace root. Tools already accept absolute paths, so this
      * only widens the write guard and tells the model the root exists. Rebuilding
@@ -3613,16 +3635,28 @@ export class AgentSession {
         }
         // Auto-compact on load if the restored session exceeds the context window.
         // Without this, huge sessions (1M+ tokens) get loaded into memory and OOM.
-        const creds = await this.authStorage.resolveCredentials(this.provider, {
-            storageKeys: this.currentAuthStorageKeys(),
+        // Credentials only refine the context window here (OpenAI OAuth's Codex
+        // window). A missing login must not make the old conversation unopenable —
+        // the user can switch to a model they're signed in to once it's loaded;
+        // the first prompt still fails cleanly through the run's auth handling.
+        const creds = await this.authStorage
+            .resolveCredentials(this.provider, { storageKeys: this.currentAuthStorageKeys() })
+            .catch((err) => {
+            if (!(err instanceof NotLoggedInError))
+                throw err;
+            log("WARN", "session", "Resuming without credentials for the session model", {
+                provider: this.provider,
+                model: this.model,
+            });
+            return undefined;
         });
         // Cache for sync callers (see field doc) so the app-sidecar's footer shows
         // the right context window immediately on resume, before any prompt runs
         // runLoop() and would otherwise be the first to set this.
-        this.lastAccountId = creds.accountId;
+        this.lastAccountId = creds?.accountId;
         const contextWindow = getContextWindow(this.model, {
             provider: this.provider,
-            accountId: creds.accountId,
+            accountId: creds?.accountId,
         });
         this.sessionId = loaded.header.id;
         this.setSessionPath(loaded.path);
@@ -3632,20 +3666,22 @@ export class AgentSession {
             model: this.model,
             contextWindow,
             threshold: this.settingsManager.get("compactThreshold"),
-            accountId: creds.accountId,
+            accountId: creds?.accountId,
             approvedPlanPath: this.approvedPlanPath,
         });
         log("INFO", "compaction", "Restore compaction decision", {
             provider: this.provider,
             model: this.model,
-            transport: this.provider === "openai" && creds.accountId ? "codex_oauth" : "public_api",
+            transport: this.provider === "openai" && creds?.accountId ? "codex_oauth" : "public_api",
             contextWindow: String(contextWindow),
             activeTokens: "estimated",
             triggerLimit: String(loadPolicy.targetTokens),
         });
         const needsLoadCompaction = this.settingsManager.get("autoCompact") &&
             shouldCompact(this.messages, contextWindow, loadPolicy.threshold, undefined, loadPolicy.targetTokens);
-        if (needsLoadCompaction && this.opts.deferLoadCompaction) {
+        // Without credentials the summary call can't run now; defer it to the first
+        // prompt, by which point the user has picked a model they're signed in to.
+        if (needsLoadCompaction && (this.opts.deferLoadCompaction || !creds)) {
             // Canonicalize again immediately before the first prompt is persisted:
             // another process may create the shared checkpoint after this load.
             this.deferredCompactionPending = true;