@productbrain/cli 0.1.0-beta.44 → 0.1.0-beta.4415

package/dist/lib/rate-limit.js

@@ -0,0 +1,83 @@
+/**
+ * WP-579 — client-side rate-limit resilience for the gateway helpers in client.ts
+ * (TEN-2923 touch amplification, TEN-2924 no-backoff-on-429).
+ *
+ * Split out of client.ts rather than grown inside it: these are two self-contained
+ * policies (when to retry a throttled call, when a session touch is worth sending) with
+ * their own constants and module-level state, and client.ts is at its STD-2 budget.
+ *
+ * Depends only on the error taxonomy — NOT on client.ts's `McpError` — so the two modules
+ * don't form an import cycle. The retry keys off the error's `code`, which is exactly what
+ * the guard tested before the split (`McpError` is the only thing that sets
+ * `code === 'rate-limited'` alongside a `retryAfterSeconds`).
+ */
+import { ErrorCode } from './errors.js';
+const MAX_RATE_LIMIT_RETRIES = 3;
+const RATE_LIMIT_RETRY_JITTER_MS = 250;
+/**
+ * Ceiling on a single honored Retry-After. The server clamps its value to the tripped
+ * window (convex/rateLimiter.ts `retryAfterSeconds`) — 60s for the minute window, but
+ * 86_400s for the DAY window. Honoring that unconditionally would park the process for up
+ * to a day per attempt, three attempts deep. A day-quota denial is not something to wait
+ * out in-process: surface it so the caller can retry out of band.
+ */
+const MAX_RATE_LIMIT_RETRY_WAIT_SECONDS = 60;
+/** Seconds to wait, if this error is a rate-limit refusal that carries a Retry-After. */
+function rateLimitWaitOf(err) {
+    const candidate = err;
+    if (!candidate || candidate.code !== ErrorCode.RATE_LIMITED)
+        return undefined;
+    return typeof candidate.retryAfterSeconds === 'number' ? candidate.retryAfterSeconds : undefined;
+}
+/**
+ * TEN-2924: bounded, jittered retry for a rate-limited call. Honors the server's
+ * Retry-After rather than guessing a backoff curve. Only retries a rate-limit refusal —
+ * never a validation/auth/internal failure, which retrying unchanged would just repeat.
+ */
+export async function withRateLimitRetry(attempt) {
+    for (let retries = 0;; retries++) {
+        try {
+            return await attempt();
+        }
+        catch (err) {
+            const waitSeconds = rateLimitWaitOf(err);
+            if (waitSeconds === undefined || retries >= MAX_RATE_LIMIT_RETRIES)
+                throw err;
+            // Day-window denial (or any wait we won't sit on) — fail fast rather than hang.
+            if (waitSeconds > MAX_RATE_LIMIT_RETRY_WAIT_SECONDS)
+                throw err;
+            const delayMs = waitSeconds * 1000 + Math.random() * RATE_LIMIT_RETRY_JITTER_MS;
+            await new Promise((resolve) => setTimeout(resolve, delayMs));
+        }
+    }
+}
+/** Applies the rate-limit retry unless the caller opted out (background calls). */
+export function maybeRetry(attempt, options) {
+    return options?.retryOnRateLimit === false ? attempt() : withRateLimitRetry(attempt);
+}
+/**
+ * TEN-2923: client-side throttle mirroring packages/mcp-server/src/client.ts's
+ * touchSessionActivity — the server already no-ops a touch made <5s after the last one
+ * for this session (TOUCH_SESSION_THROTTLE_MS, DEC-75), so a touch inside that window is
+ * pure wasted quota. Matching the server's own window here removes the waste without
+ * changing renewal semantics at all (a throttled call was already a server-side no-op).
+ */
+const _lastTouchAtBySession = new Map();
+const TOUCH_THROTTLE_MS = 5_000;
+export function shouldTouchSession(sessionId) {
+    const now = Date.now();
+    const lastTouchAt = _lastTouchAtBySession.get(sessionId) ?? 0;
+    if (now - lastTouchAt < TOUCH_THROTTLE_MS)
+        return false;
+    _lastTouchAtBySession.set(sessionId, now);
+    return true;
+}
+/** Test-only escape hatch — mirrors packages/mcp-server/src/client.ts's resetTouchThrottle. */
+export function resetTouchThrottle(sessionId) {
+    if (sessionId) {
+        _lastTouchAtBySession.delete(sessionId);
+        return;
+    }
+    _lastTouchAtBySession.clear();
+}
+//# sourceMappingURL=rate-limit.js.map

package/dist/lib/rate-limit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../src/lib/rate-limit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AACjC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AACvC;;;;;;GAMG;AACH,MAAM,iCAAiC,GAAG,EAAE,CAAC;AAE7C,yFAAyF;AACzF,SAAS,eAAe,CAAC,GAAY;IACnC,MAAM,SAAS,GAAG,GAAwE,CAAC;IAC3F,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,YAAY;QAAE,OAAO,SAAS,CAAC;IAC9E,OAAO,OAAO,SAAS,CAAC,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC;AACnG,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAI,OAAyB;IACnE,KAAK,IAAI,OAAO,GAAG,CAAC,GAAI,OAAO,EAAE,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,OAAO,MAAM,OAAO,EAAE,CAAC;QACzB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,WAAW,KAAK,SAAS,IAAI,OAAO,IAAI,sBAAsB;gBAAE,MAAM,GAAG,CAAC;YAC9E,gFAAgF;YAChF,IAAI,WAAW,GAAG,iCAAiC;gBAAE,MAAM,GAAG,CAAC;YAC/D,MAAM,OAAO,GAAG,WAAW,GAAG,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,0BAA0B,CAAC;YAChF,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;AACH,CAAC;AAaD,mFAAmF;AACnF,MAAM,UAAU,UAAU,CAAI,OAAyB,EAAE,OAA2B;IAClF,OAAO,OAAO,EAAE,gBAAgB,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;AACvF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAkB,CAAC;AACxD,MAAM,iBAAiB,GAAG,KAAK,CAAC;AAEhC,MAAM,UAAU,kBAAkB,CAAC,SAAiB;IAClD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,WAAW,GAAG,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9D,IAAI,GAAG,GAAG,WAAW,GAAG,iBAAiB;QAAE,OAAO,KAAK,CAAC;IACxD,qBAAqB,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAC1C,OAAO,IAAI,CAAC;AACd,CAAC;AAED,+FAA+F;AAC/F,MAAM,UAAU,kBAAkB,CAAC,SAAyB;IAC1D,IAAI,SAAS,EAAE,CAAC;QACd,qBAAqB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACxC,OAAO;IACT,CAAC;IACD,qBAAqB,CAAC,KAAK,EAAE,CAAC;AAChC,CAAC"}

package/dist/lib/runner.d.ts

@@ -15,7 +15,15 @@ export declare function getOutputMode(): 'auto' | 'json' | 'pretty';
 /** Returns true if the current output mode resolves to JSON. */
 export declare function isJsonMode(): boolean;
 export declare function setQuietMode(quiet: boolean): void;
+/**
+ * The RAW quiet flag, independent of JSON mode. isQuietMode() conflates JSON mode,
+ * so read this when you need the literal quiet state (e.g. to assert that a window
+ * left quiet — and therefore the interactive-prompt gate — untouched).
+ */
+export declare function getQuietMode(): boolean;
 export declare function isQuietMode(): boolean;
+export declare function setSpinnersSilenced(silenced: boolean): void;
+export declare function areSpinnersSilenced(): boolean;
 export interface RunCliCommandOptions<T> {
     /** The async function that performs the MCP call and returns data. */
     fn: () => Promise<T>;

package/dist/lib/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/lib/runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAWH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,GAAG,IAAI,CAEpE;AAED,wBAAgB,aAAa,IAAI,MAAM,GAAG,MAAM,GAAG,QAAQ,CAE1D;AAED,gEAAgE;AAChE,wBAAgB,UAAU,IAAI,OAAO,CAKpC;AASD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAEjD;AAED,wBAAgB,WAAW,IAAI,OAAO,CAIrC;AAED,MAAM,WAAW,oBAAoB,CAAC,CAAC;IACrC,sEAAsE;IACtE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;IACrB,kDAAkD;IAClD,YAAY,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,MAAM,CAAC;CACnC;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBtF"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/lib/runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAWH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,GAAG,IAAI,CAEpE;AAED,wBAAgB,aAAa,IAAI,MAAM,GAAG,MAAM,GAAG,QAAQ,CAE1D;AAED,gEAAgE;AAChE,wBAAgB,UAAU,IAAI,OAAO,CAKpC;AASD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAEjD;AAED;;;;GAIG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAEtC;AAED,wBAAgB,WAAW,IAAI,OAAO,CAIrC;AAYD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAE3D;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C;AAED,MAAM,WAAW,oBAAoB,CAAC,CAAC;IACrC,sEAAsE;IACtE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;IACrB,kDAAkD;IAClD,YAAY,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,MAAM,CAAC;CACnC;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBtF"}

package/dist/lib/runner.js

@@ -41,12 +41,35 @@ let quietMode = false;
 export function setQuietMode(quiet) {
     quietMode = quiet;
 }
+/**
+ * The RAW quiet flag, independent of JSON mode. isQuietMode() conflates JSON mode,
+ * so read this when you need the literal quiet state (e.g. to assert that a window
+ * left quiet — and therefore the interactive-prompt gate — untouched).
+ */
+export function getQuietMode() {
+    return quietMode;
+}
 export function isQuietMode() {
     // JSON mode is inherently quiet — no decorative output needed
     if (isJsonMode())
         return true;
     return quietMode;
 }
+/**
+ * Spinner suppression — independent of quiet/json mode. Silences withSpinner()
+ * output WITHOUT making the CLI "quiet" (quiet also gates interactive prompts via
+ * prompts.ts/assertInteractive). `pb connect` flips this to hide the raw per-kernelCall
+ * spinner labels ("Loading chain getVocabulary", …) while still letting the handshake's
+ * adopt/revert prompts for PB-managed tampered files run (TEN-2561 / WP-2: legible
+ * output must never silence a prompt the user needs to answer).
+ */
+let spinnersSilenced = false;
+export function setSpinnersSilenced(silenced) {
+    spinnersSilenced = silenced;
+}
+export function areSpinnersSilenced() {
+    return spinnersSilenced;
+}
 /**
  * Execute a CLI command with unified output handling.
  *

package/dist/lib/runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/lib/runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC;;;GAGG;AACH,IAAI,UAAU,GAA+B,MAAM,CAAC;AAEpD,MAAM,UAAU,aAAa,CAAC,IAAgC;IAC5D,UAAU,GAAG,IAAI,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,gEAAgE;AAChE,MAAM,UAAU,UAAU;IACxB,IAAI,UAAU,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,UAAU,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC1C,4CAA4C;IAC5C,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;AAC/B,CAAC;AAED;;;;GAIG;AACH,IAAI,SAAS,GAAG,KAAK,CAAC;AAEtB,MAAM,UAAU,YAAY,CAAC,KAAc;IACzC,SAAS,GAAG,KAAK,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,WAAW;IACzB,8DAA8D;IAC9D,IAAI,UAAU,EAAE;QAAE,OAAO,IAAI,CAAC;IAC9B,OAAO,SAAS,CAAC;AACnB,CAAC;AASD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAI,OAAgC;IACrE,MAAM,IAAI,GAAG,UAAU,EAAE,CAAC;IAE1B,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,EAAE,EAAE,CAAC;QAEhC,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAC5C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAC7C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,6EAA6E;QAC7E,+DAA+D;QAC/D,IAAI,GAAG,YAAY,QAAQ,EAAE,CAAC;YAC5B,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,MAAM,IAAI,QAAQ,CAChB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAChD,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,CAC3C,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/lib/runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC;;;GAGG;AACH,IAAI,UAAU,GAA+B,MAAM,CAAC;AAEpD,MAAM,UAAU,aAAa,CAAC,IAAgC;IAC5D,UAAU,GAAG,IAAI,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,gEAAgE;AAChE,MAAM,UAAU,UAAU;IACxB,IAAI,UAAU,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACvC,IAAI,UAAU,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC1C,4CAA4C;IAC5C,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;AAC/B,CAAC;AAED;;;;GAIG;AACH,IAAI,SAAS,GAAG,KAAK,CAAC;AAEtB,MAAM,UAAU,YAAY,CAAC,KAAc;IACzC,SAAS,GAAG,KAAK,CAAC;AACpB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY;IAC1B,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,WAAW;IACzB,8DAA8D;IAC9D,IAAI,UAAU,EAAE;QAAE,OAAO,IAAI,CAAC;IAC9B,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;GAOG;AACH,IAAI,gBAAgB,GAAG,KAAK,CAAC;AAE7B,MAAM,UAAU,mBAAmB,CAAC,QAAiB;IACnD,gBAAgB,GAAG,QAAQ,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AASD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAI,OAAgC;IACrE,MAAM,IAAI,GAAG,UAAU,EAAE,CAAC;IAE1B,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,EAAE,EAAE,CAAC;QAEhC,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAC5C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAC7C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,6EAA6E;QAC7E,+DAA+D;QAC/D,IAAI,GAAG,YAAY,QAAQ,EAAE,CAAC;YAC5B,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,MAAM,IAAI,QAAQ,CAChB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAChD,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,CAC3C,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/lib/session.d.ts

@@ -2,6 +2,20 @@
  * Session state — persists active session ID between CLI invocations.
  * Stored at .productbrain/session.json in the project root.
  * Solves TEN-264 (option 1: explicit session token).
+ *
+ * WP-322 S2: session.json also serves as a closed marker (closedAt present)
+ * for auto-resume logic when the last session closed <2h ago.
+ *
+ * WP-479 E2 (client half): when a conversation identity resolves (see ./conversation.ts —
+ * PB_CONVERSATION_ID / CLAUDE_CODE_SESSION_ID / CURSOR_CONVERSATION_ID / hashed
+ * CODEX_TUI_SESSION_LOG_PATH), the marker moves to `.productbrain/sessions/<conversationId>.json`
+ * so concurrent harness conversations sharing a worktree don't collide on one marker. Every
+ * function below resolves the conversation id ONCE (via resolveConversationId) and derives its
+ * path from that single value. With no identity signal present, resolveConversationId() returns
+ * null and every function falls back to the exact legacy `.productbrain/session.json` path and
+ * behavior — byte-identical, zero-config invariant. An explicit `conversationIdOverride` (only
+ * threaded from the CLI's `--conversation` flag on `pb session start`) takes priority over env
+ * detection; every other call site across the CLI calls these with no argument.
  */
 export interface SessionState {
     sessionId: string;
@@ -9,9 +23,76 @@ export interface SessionState {
     workspaceName: string;
     startedAt: string;
     entriesCaptured: string[];
+    /** Optional: set when session is closed. Presence indicates a closed-marker state. */
+    closedAt?: string;
+    /** Effective profile name at session start — backstop for detecting a profile switch. */
+    profile?: string;
+    /** WP-479 E2: the conversation identity this marker is scoped to, when one resolved. */
+    conversationId?: string;
 }
-export declare function readSession(): SessionState | null;
-export declare function writeSession(state: SessionState): void;
-export declare function clearSession(): void;
-export declare function addCapturedEntry(entryId: string): void;
+/** 2-hour window for auto-resume (WP-322 E1) — also the GC threshold for closed conversation
+ *  markers (WP-479 E2): a closed marker past this window will never be auto-resumed, so it's
+ *  garbage. Exported so commands/session.ts's resume logic uses the exact same constant. */
+export declare const RESUME_WINDOW_MS: number;
+/** Shape returned by readClosedMarker when a closed marker is present. */
+export interface ClosedMarker {
+    sessionId: string;
+    closedAt: string;
+    workspaceId: string;
+    workspaceName: string;
+    /** WP-479 E2: the conversation identity this marker was scoped to, when one resolved. */
+    conversationId?: string;
+}
+export declare function readSession(conversationIdOverride?: string): SessionState | null;
+export declare function writeSession(state: SessionState, conversationIdOverride?: string): void;
+/**
+ * Writes a closed marker instead of deleting the file.
+ * If the file is already a closed marker (closedAt present), deletes it outright
+ * to prevent a stale-marker reset loop (F2: Domain Fit review finding).
+ * Uses atomic write (tmp → rename) to prevent partial writes on active sessions.
+ * WP-322 S2 — enables auto-resume within 2h window.
+ */
+export declare function clearSession(conversationIdOverride?: string): void;
+/**
+ * Delete the CURRENT conversation's marker outright — NO closed marker. Use when discarding a
+ * single conversation's session (clearSession writes a resume marker; that is only correct for
+ * session close).
+ */
+export declare function discardSession(conversationIdOverride?: string): void;
+/**
+ * Delete EVERY session marker in this project — the legacy `session.json` AND every per-conversation
+ * marker under `.productbrain/sessions/`. Use on a WORKSPACE change (profile switch / connect
+ * redirect) so the 2h auto-resume can't re-pin the old workspace from ANY marker.
+ *
+ * Review fix (Codex): `discardSession()` resolves only the CURRENT conversation's marker, so a
+ * workspace-switch caller with no conversation env would leave other conversations' active markers
+ * behind — later reusable against the NEW workspace. A workspace change invalidates ALL of them, so
+ * this clears the whole set rather than one marker.
+ */
+export declare function discardAllSessions(): void;
+/** True if a session marker file exists at all — active session OR closed marker. */
+export declare function sessionFileExists(conversationIdOverride?: string): boolean;
+/**
+ * True if ANY session marker exists — the legacy `session.json` OR any per-conversation marker under
+ * `.productbrain/sessions/`. Used by `pb session reset` so a hard reset (and the binding-flip recovery
+ * it backs) can detect + clear a sibling conversation's marker it has no env to resolve (Codex
+ * re-review — the flip guard refuses on ANY active marker, so reset must see them ALL).
+ */
+export declare function hasAnySessionMarker(): boolean;
+/**
+ * True if ANY marker — legacy `session.json` OR any per-conversation marker — represents an ACTIVE
+ * session (no `closedAt`). Used by `pb session reset` so its confirmation/`--force` guard fires when
+ * a SIBLING conversation's session is active, not only the current one (Codex re-review: an
+ * all-marker reset must not silently strand an active sibling server session). Closed markers are
+ * inert and don't require a prompt.
+ */
+export declare function hasAnyActiveSession(): boolean;
+/**
+ * Reads the closed marker from the resolved conversation's marker file (or the legacy
+ * session.json when no conversation identity resolves).
+ * Returns the marker if closedAt is present, otherwise null.
+ * WP-322 S2 — used by runSessionStart to detect recent closed sessions.
+ */
+export declare function readClosedMarker(conversationIdOverride?: string): ClosedMarker | null;
+export declare function addCapturedEntry(entryId: string, conversationIdOverride?: string): void;
 //# sourceMappingURL=session.d.ts.map

package/dist/lib/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/lib/session.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAUD,wBAAgB,WAAW,IAAI,YAAY,GAAG,IAAI,CAQjD;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAItD;AAED,wBAAgB,YAAY,IAAI,IAAI,CAGnC;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAKtD"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/lib/session.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAOH,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,sFAAsF;IACtF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yFAAyF;IACzF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wFAAwF;IACxF,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;4FAE4F;AAC5F,eAAO,MAAM,gBAAgB,QAAqB,CAAC;AAEnD,0EAA0E;AAC1E,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,yFAAyF;IACzF,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAiFD,wBAAgB,WAAW,CAAC,sBAAsB,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAahF;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,YAAY,EAAE,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,CAUvF;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,CA6BlE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,CAIpE;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAmBzC;AAED,qFAAqF;AACrF,wBAAgB,iBAAiB,CAAC,sBAAsB,CAAC,EAAE,MAAM,GAAG,OAAO,CAG1E;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAS7C;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAkB7C;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,sBAAsB,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAkBrF;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,CAKvF"}

package/dist/lib/session.js

@@ -2,42 +2,305 @@
  * Session state — persists active session ID between CLI invocations.
  * Stored at .productbrain/session.json in the project root.
  * Solves TEN-264 (option 1: explicit session token).
+ *
+ * WP-322 S2: session.json also serves as a closed marker (closedAt present)
+ * for auto-resume logic when the last session closed <2h ago.
+ *
+ * WP-479 E2 (client half): when a conversation identity resolves (see ./conversation.ts —
+ * PB_CONVERSATION_ID / CLAUDE_CODE_SESSION_ID / CURSOR_CONVERSATION_ID / hashed
+ * CODEX_TUI_SESSION_LOG_PATH), the marker moves to `.productbrain/sessions/<conversationId>.json`
+ * so concurrent harness conversations sharing a worktree don't collide on one marker. Every
+ * function below resolves the conversation id ONCE (via resolveConversationId) and derives its
+ * path from that single value. With no identity signal present, resolveConversationId() returns
+ * null and every function falls back to the exact legacy `.productbrain/session.json` path and
+ * behavior — byte-identical, zero-config invariant. An explicit `conversationIdOverride` (only
+ * threaded from the CLI's `--conversation` flag on `pb session start`) takes priority over env
+ * detection; every other call site across the CLI calls these with no argument.
  */
-import { existsSync, readFileSync, writeFileSync, unlinkSync, mkdirSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync, renameSync, mkdirSync, unlinkSync, readdirSync } from 'fs';
 import { join } from 'path';
+import { findProjectRoot } from './config.js';
+import { resolveConversationId } from './conversation.js';
+/** 2-hour window for auto-resume (WP-322 E1) — also the GC threshold for closed conversation
+ *  markers (WP-479 E2): a closed marker past this window will never be auto-resumed, so it's
+ *  garbage. Exported so commands/session.ts's resume logic uses the exact same constant. */
+export const RESUME_WINDOW_MS = 2 * 60 * 60 * 1000;
+/**
+ * Resolve the `.productbrain/` session directory off the CLI project root — the SAME
+ * walked-up root config.ts resolves credentials against (findProjectRoot), which is also the
+ * repo-root that scripts/pb-binding.mjs targets. Anchoring all three to one root means the
+ * binding-flip guard (hasActiveSession in pb-binding.mjs) inspects the exact session.json the
+ * CLI writes, even when a command runs from a subdirectory such as packages/cli — a cwd-relative
+ * dir would put the session under packages/cli/.productbrain and the guard would miss it
+ * (codex PR #145 review). Falls back to cwd when no config-bearing root is found (fresh worktree
+ * before any config has landed).
+ */
 function getSessionDir() {
-    return join(process.cwd(), '.productbrain');
+    return join(findProjectRoot(process.cwd()) ?? process.cwd(), '.productbrain');
 }
 function getSessionPath() {
     return join(getSessionDir(), 'session.json');
 }
-export function readSession() {
-    const p = getSessionPath();
+function getTmpSessionPath() {
+    return join(getSessionDir(), 'session.json.tmp');
+}
+/** WP-479 E2: directory holding one marker file per resolved conversation id. */
+function getSessionsDir() {
+    return join(getSessionDir(), 'sessions');
+}
+function getConversationMarkerPath(conversationId) {
+    return join(getSessionsDir(), `${conversationId}.json`);
+}
+function getConversationTmpMarkerPath(conversationId) {
+    return join(getSessionsDir(), `${conversationId}.json.tmp`);
+}
+/**
+ * Resolve the marker path for a given (already-resolved) conversation id: the conversation-scoped
+ * path under `.productbrain/sessions/` when non-null, else the legacy shared path — the single
+ * fork point every function below routes through.
+ */
+function markerPath(conversationId) {
+    return conversationId ? getConversationMarkerPath(conversationId) : getSessionPath();
+}
+function tmpMarkerPath(conversationId) {
+    return conversationId ? getConversationTmpMarkerPath(conversationId) : getTmpSessionPath();
+}
+/**
+ * WP-479 E2 GC: delete closed conversation markers whose `closedAt` is older than the 2h resume
+ * window — a closed marker outside that window will never be auto-resumed, so it's inert litter.
+ * Best-effort, and cheap (no-ops when the sessions dir doesn't exist yet). Scoped to the
+ * conversation-marker directory only — the single legacy `session.json` is never GC'd here (its
+ * own clearSession/discardSession lifecycle is unchanged).
+ */
+function gcExpiredConversationMarkers() {
+    const dir = getSessionsDir();
+    if (!existsSync(dir))
+        return;
+    let entries;
+    try {
+        entries = readdirSync(dir);
+    }
+    catch {
+        return;
+    }
+    const now = Date.now();
+    for (const entry of entries) {
+        if (!entry.endsWith('.json'))
+            continue;
+        const full = join(dir, entry);
+        try {
+            const raw = JSON.parse(readFileSync(full, 'utf8'));
+            if (raw.closedAt && now - new Date(raw.closedAt).getTime() > RESUME_WINDOW_MS) {
+                unlinkSync(full);
+            }
+        }
+        catch {
+            // Malformed or concurrently-removed marker — ignore, non-blocking.
+        }
+    }
+}
+export function readSession(conversationIdOverride) {
+    gcExpiredConversationMarkers();
+    const conversationId = resolveConversationId(conversationIdOverride);
+    const p = markerPath(conversationId);
     if (!existsSync(p))
         return null;
     try {
-        return JSON.parse(readFileSync(p, 'utf8'));
+        const raw = JSON.parse(readFileSync(p, 'utf8'));
+        // If closedAt is present it's a closed marker, not an active session
+        if (raw.closedAt)
+            return null;
+        return raw;
     }
     catch {
         return null;
     }
 }
-export function writeSession(state) {
-    const dir = getSessionDir();
+export function writeSession(state, conversationIdOverride) {
+    const conversationId = resolveConversationId(conversationIdOverride);
+    // Stamp the resolved conversation id onto the state itself (WP-479 E2: "store the
+    // conversationId in it") so a later bare readSession() round-trips it, and so the marker file's
+    // own contents self-identify which conversation it belongs to.
+    state.conversationId = conversationId ?? undefined;
+    const dir = conversationId ? getSessionsDir() : getSessionDir();
     if (!existsSync(dir))
         mkdirSync(dir, { recursive: true });
-    writeFileSync(getSessionPath(), JSON.stringify(state, null, 2));
+    writeFileSync(markerPath(conversationId), JSON.stringify(state, null, 2));
+    gcExpiredConversationMarkers();
 }
-export function clearSession() {
-    const p = getSessionPath();
+/**
+ * Writes a closed marker instead of deleting the file.
+ * If the file is already a closed marker (closedAt present), deletes it outright
+ * to prevent a stale-marker reset loop (F2: Domain Fit review finding).
+ * Uses atomic write (tmp → rename) to prevent partial writes on active sessions.
+ * WP-322 S2 — enables auto-resume within 2h window.
+ */
+export function clearSession(conversationIdOverride) {
+    const conversationId = resolveConversationId(conversationIdOverride);
+    const p = markerPath(conversationId);
+    if (!existsSync(p))
+        return;
+    try {
+        const existing = JSON.parse(readFileSync(p, 'utf8'));
+        // If already a marker, delete outright — don't refresh the timestamp
+        if (existing.closedAt) {
+            unlinkSync(p);
+            return;
+        }
+        const marker = {
+            sessionId: existing.sessionId,
+            workspaceId: existing.workspaceId,
+            workspaceName: existing.workspaceName,
+            startedAt: existing.startedAt,
+            entriesCaptured: [],
+            closedAt: new Date().toISOString(),
+            conversationId: conversationId ?? undefined,
+        };
+        const dir = conversationId ? getSessionsDir() : getSessionDir();
+        if (!existsSync(dir))
+            mkdirSync(dir, { recursive: true });
+        const tmp = tmpMarkerPath(conversationId);
+        writeFileSync(tmp, JSON.stringify(marker, null, 2));
+        renameSync(tmp, p);
+    }
+    catch {
+        // If we can't write the marker, the file stays as-is (non-blocking).
+    }
+    gcExpiredConversationMarkers();
+}
+/**
+ * Delete the CURRENT conversation's marker outright — NO closed marker. Use when discarding a
+ * single conversation's session (clearSession writes a resume marker; that is only correct for
+ * session close).
+ */
+export function discardSession(conversationIdOverride) {
+    const conversationId = resolveConversationId(conversationIdOverride);
+    const p = markerPath(conversationId);
     if (existsSync(p))
         unlinkSync(p);
 }
-export function addCapturedEntry(entryId) {
-    const session = readSession();
+/**
+ * Delete EVERY session marker in this project — the legacy `session.json` AND every per-conversation
+ * marker under `.productbrain/sessions/`. Use on a WORKSPACE change (profile switch / connect
+ * redirect) so the 2h auto-resume can't re-pin the old workspace from ANY marker.
+ *
+ * Review fix (Codex): `discardSession()` resolves only the CURRENT conversation's marker, so a
+ * workspace-switch caller with no conversation env would leave other conversations' active markers
+ * behind — later reusable against the NEW workspace. A workspace change invalidates ALL of them, so
+ * this clears the whole set rather than one marker.
+ */
+export function discardAllSessions() {
+    const legacy = getSessionPath();
+    if (existsSync(legacy))
+        unlinkSync(legacy);
+    const dir = getSessionsDir();
+    if (!existsSync(dir))
+        return;
+    let entries;
+    try {
+        entries = readdirSync(dir);
+    }
+    catch {
+        return;
+    }
+    for (const entry of entries) {
+        if (!entry.endsWith('.json'))
+            continue;
+        try {
+            unlinkSync(join(dir, entry));
+        }
+        catch {
+            // concurrently removed — ignore, non-blocking.
+        }
+    }
+}
+/** True if a session marker file exists at all — active session OR closed marker. */
+export function sessionFileExists(conversationIdOverride) {
+    const conversationId = resolveConversationId(conversationIdOverride);
+    return existsSync(markerPath(conversationId));
+}
+/**
+ * True if ANY session marker exists — the legacy `session.json` OR any per-conversation marker under
+ * `.productbrain/sessions/`. Used by `pb session reset` so a hard reset (and the binding-flip recovery
+ * it backs) can detect + clear a sibling conversation's marker it has no env to resolve (Codex
+ * re-review — the flip guard refuses on ANY active marker, so reset must see them ALL).
+ */
+export function hasAnySessionMarker() {
+    if (existsSync(getSessionPath()))
+        return true;
+    const dir = getSessionsDir();
+    if (!existsSync(dir))
+        return false;
+    try {
+        return readdirSync(dir).some((f) => f.endsWith('.json'));
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * True if ANY marker — legacy `session.json` OR any per-conversation marker — represents an ACTIVE
+ * session (no `closedAt`). Used by `pb session reset` so its confirmation/`--force` guard fires when
+ * a SIBLING conversation's session is active, not only the current one (Codex re-review: an
+ * all-marker reset must not silently strand an active sibling server session). Closed markers are
+ * inert and don't require a prompt.
+ */
+export function hasAnyActiveSession() {
+    const isActive = (p) => {
+        try {
+            const raw = JSON.parse(readFileSync(p, 'utf8'));
+            return !raw.closedAt;
+        }
+        catch {
+            return false; // malformed/unreadable — treat as not-active (inert)
+        }
+    };
+    const legacy = getSessionPath();
+    if (existsSync(legacy) && isActive(legacy))
+        return true;
+    const dir = getSessionsDir();
+    if (!existsSync(dir))
+        return false;
+    try {
+        return readdirSync(dir).some((f) => f.endsWith('.json') && isActive(join(dir, f)));
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Reads the closed marker from the resolved conversation's marker file (or the legacy
+ * session.json when no conversation identity resolves).
+ * Returns the marker if closedAt is present, otherwise null.
+ * WP-322 S2 — used by runSessionStart to detect recent closed sessions.
+ */
+export function readClosedMarker(conversationIdOverride) {
+    gcExpiredConversationMarkers();
+    const conversationId = resolveConversationId(conversationIdOverride);
+    const p = markerPath(conversationId);
+    if (!existsSync(p))
+        return null;
+    try {
+        const raw = JSON.parse(readFileSync(p, 'utf8'));
+        if (!raw.closedAt)
+            return null;
+        return {
+            sessionId: raw.sessionId,
+            closedAt: raw.closedAt,
+            workspaceId: raw.workspaceId,
+            workspaceName: raw.workspaceName,
+            conversationId: raw.conversationId,
+        };
+    }
+    catch {
+        return null;
+    }
+}
+export function addCapturedEntry(entryId, conversationIdOverride) {
+    const session = readSession(conversationIdOverride);
     if (!session)
         return;
     session.entriesCaptured.push(entryId);
-    writeSession(session);
+    writeSession(session, conversationIdOverride);
 }
 //# sourceMappingURL=session.js.map

package/dist/lib/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/lib/session.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AACpF,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAU5B,SAAS,aAAa;IACpB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,cAAc;IACrB,OAAO,IAAI,CAAC,aAAa,EAAE,EAAE,cAAc,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,WAAW;IACzB,MAAM,CAAC,GAAG,cAAc,EAAE,CAAC;IAC3B,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAChC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAiB,CAAC;IAC7D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAAmB;IAC9C,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAC5B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,aAAa,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,MAAM,CAAC,GAAG,cAAc,EAAE,CAAC;IAC3B,IAAI,UAAU,CAAC,CAAC,CAAC;QAAE,UAAU,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,MAAM,OAAO,GAAG,WAAW,EAAE,CAAC;IAC9B,IAAI,CAAC,OAAO;QAAE,OAAO;IACrB,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtC,YAAY,CAAC,OAAO,CAAC,CAAC;AACxB,CAAC"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/lib/session.ts"],"names":[],"mappings":"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"}