@hienlh/ppm 0.20.3 → 0.20.5

package/src/providers/codex-app-server/codex-event-mapper.ts

@@ -126,11 +126,13 @@ export function itemToToolResult(item: Item): ChatEvent {
   const type = item.type;
   let output = "";
   let isError = false;
+  let exitCode: number | undefined;
 
   if (type === "commandExecution") {
     output = redactTruncate(item.aggregatedOutput ?? "");
     const exit = item.exitCode;
-    isError = typeof exit === "number" && exit !== 0;
+    exitCode = typeof exit === "number" ? exit : undefined;
+    isError = exitCode != null && exitCode !== 0;
   } else if (type === "mcpToolCall") {
     output = redactTruncate(item.result ?? item.error ?? "");
     isError = item.error != null;
@@ -153,7 +155,7 @@ export function itemToToolResult(item: Item): ChatEvent {
     output = redactTruncate(item);
   }
 
-  return { type: "tool_result", output, isError, toolUseId: item.id };
+  return { type: "tool_result", output, isError, ...(exitCode != null ? { exitCode } : {}), toolUseId: item.id };
 }
 
 /**
@@ -168,6 +170,10 @@ export function mapCodexEvent(notif: Notif, sessionId: string): ChatEvent[] {
       return typeof p.delta === "string" ? [{ type: "text", content: p.delta }] : [];
 
     case "item/reasoning/textDelta":
+    // `summary` is what turn/start requests for PPM's Thinking switch. Recent
+    // app-server builds stream it under this method, while older builds used
+    // textDelta directly. Both are safe, user-visible reasoning summaries.
+    case "item/reasoning/summaryTextDelta":
       return typeof p.delta === "string" ? [{ type: "thinking", content: p.delta }] : [];
 
     case "item/started": {

package/src/providers/codex-app-server/codex-history.ts

@@ -411,10 +411,12 @@ export function getRolloutMessages(sessionsDir: string, threadId: string, reques
   } catch { return []; }
 }
 
-/** True when a path points at a codex rollout under ~/.codex/sessions. */
+/** True when a path points at a codex rollout in the ambient or a PPM account home. */
 export function isCodexRolloutPath(p: string): boolean {
   const n = normPath(p);
-  return n.endsWith(".jsonl") && n.includes(normPath(join(homedir(), ".codex", "sessions")));
+  const ambient = normPath(join(homedir(), ".codex", "sessions"));
+  const managed = normPath(join(homedir(), ".ppm", "codex-accounts"));
+  return n.endsWith(".jsonl") && (n.includes(ambient) || (n.includes(managed) && n.includes("/sessions/")));
 }
 
 /**

package/src/providers/codex-app-server/codex-protocol.ts

@@ -56,6 +56,10 @@ export interface TurnStartParams {
   approvalPolicy?: AskForApproval;
   sandboxPolicy?: unknown;
   model?: string;
+  /** Codex's per-turn reasoning depth (low through ultra, model dependent). */
+  effort?: string;
+  /** Controls whether Codex streams a safe reasoning summary to the client. */
+  summary?: "none" | "auto" | "concise" | "detailed";
 }
 
 // ── Decisions (approval responses) ──

package/src/providers/codex-app-server/codex-provider.ts

@@ -10,7 +10,7 @@ import type {
   UsageInfo,
 } from "../provider.interface.ts";
 import { configService } from "../../services/config.service.ts";
-import { setSessionMetadata, getSessionProjectPath, setSessionProvider, setSessionCodexAccount, getSessionCodexAccount, getSessionTitles } from "../../services/db.service.ts";
+import { setSessionMetadata, getSessionProjectPath, setSessionProvider, setSessionCodexAccount, getSessionCodexAccount, getSessionTitles, insertTurnUsage } from "../../services/db.service.ts";
 import {
   resolveCodexAccountForSession,
   getCodexAccount,
@@ -29,6 +29,7 @@ import { join } from "node:path";
 import { CodexJsonRpcClient, CONTROL_REQUEST_TIMEOUT_MS } from "./codex-jsonrpc-client.ts";
 import { permissionModeToCodex, type CodexPermission } from "./codex-permission-map.ts";
 import { mapCodexEvent, parseTokenUsage } from "./codex-event-mapper.ts";
+import { subagentCardId } from "./codex-subagent-thread.ts";
 import { decisionFor, isApprovalMethod, type ApprovalMethod } from "./codex-approval-decision.ts";
 import { parseModelList } from "./codex-model-parser.ts";
 import { getOrFetchUsage, registerUsageSource } from "../../services/provider-usage/usage-registry.ts";
@@ -147,6 +148,8 @@ interface LiveSession {
   compactRequested?: boolean;
   /** Token counts from the most recent usage notification, attached to `done`. */
   lastUsage?: import("../../shared/turn-usage.ts").TurnUsage;
+  /** Spawned thread ids. Notifications from these threads belong inside their Agent card. */
+  subagentThreadIds: Set<string>;
   /** A turn is running on the thread. Codex accepts exactly one at a time: a
    *  second `turn/start` resolves with the ALREADY-RUNNING turn (same id,
    *  status `inProgress`) and silently discards the new input — no error, so
@@ -219,6 +222,21 @@ function createEventChannel(): EventChannel {
   };
 }
 
+/** The app-server puts the owner thread on every item notification.  An
+ * `agentThreadId` inside a SubAgentActivity is the newly spawned child, so it
+ * must never be used here: that would nest the launch card inside itself. */
+export function threadIdFromNotification(params: unknown): string | null {
+  if (!params || typeof params !== "object") return null;
+  const p = params as Record<string, unknown>;
+  const direct = p.threadId ?? p.thread_id;
+  if (typeof direct === "string" && direct) return direct;
+  const thread = p.thread;
+  if (thread && typeof thread === "object" && typeof (thread as Record<string, unknown>).id === "string") {
+    return (thread as Record<string, unknown>).id as string;
+  }
+  return null;
+}
+
 /**
  * Drop a model id that isn't a codex model. PPM's per-session model can fall back
  * to the global Claude default (e.g. `claude-opus-4-8`), which codex rejects
@@ -425,6 +443,7 @@ export class CodexAppServerProvider implements AIProvider {
     live.lastTurnInput = { message, opts };
     live.currentAssistant = "";
     live.currentEvents = [];
+    live.lastUsage = undefined;
     // Codex takes an image as a path, never as a payload, so the uploaded copy is what it
     // gets. Images lead: the text usually refers to them ("what is this?").
     const input: UserInput[] = [
@@ -432,10 +451,17 @@ export class CodexAppServerProvider implements AIProvider {
       { type: "text" as const, text: message, text_elements: [] },
     ];
     const turnModel = codexModel(opts?.model);
+    const turnEffort = opts?.effort ?? this.config?.effort;
+    const configuredThinking = this.config?.thinking_budget_tokens;
+    // Codex does not accept a token budget. Its equivalent is an effort level,
+    // while `summary` controls the safe thinking text the UI can show.
+    const thinkingEnabled = (opts?.thinkingBudget ?? configuredThinking ?? -1) !== 0;
     live.client.request("turn/start", {
       threadId: live.threadId,
       input,
       ...(turnModel ? { model: turnModel } : {}),
+      ...(turnEffort ? { effort: turnEffort } : {}),
+      summary: thinkingEnabled ? "detailed" : "none",
     }).then((res) => {
       // Backup for the `turn/started` notification, which is what normally names
       // the turn — an interrupt arriving in between has nothing to address.
@@ -678,7 +704,7 @@ export class CodexAppServerProvider implements AIProvider {
       client, threadId: null, cwd, channel, permission, model,
       pendingApprovals: new Map(), answeredCodexIds: new Set(),
       history: [], transcript: [], currentAssistant: "", currentEvents: [],
-      pendingTurns: [],
+      pendingTurns: [], subagentThreadIds: new Set(),
     };
     this.live.set(sessionId, live);
 
@@ -750,14 +776,26 @@ export class CodexAppServerProvider implements AIProvider {
       const usage = parseTokenUsage(notif.params, live.model);
       if (usage) live.lastUsage = usage;
     }
+    const notificationThreadId = threadIdFromNotification(notif.params);
+    const parentToolUseId = notificationThreadId && live.subagentThreadIds.has(notificationThreadId)
+      ? subagentCardId(notificationThreadId)
+      : undefined;
     const events = mapCodexEvent(notif, live.threadId ?? "");
     for (const ev of events) {
       // The counts arrive on their own notification just before the turn ends,
       // so `done` is where they become visible to a consumer.
-      if (ev.type === "done" && live.lastUsage) ev.usage = live.lastUsage;
-      live.channel.push(ev);
+      if (ev.type === "done" && live.lastUsage) {
+        ev.usage = live.lastUsage;
+        this.recordTurnUsage(live, live.lastUsage);
+      }
+      const nested = parentToolUseId ? { ...ev, parentToolUseId } as ChatEvent : ev;
+      live.channel.push(nested);
       // Accumulate tool calls into the turn so getMessages (live) keeps them.
-      if (ev.type === "tool_use" || ev.type === "tool_result") live.currentEvents.push(ev);
+      if (nested.type === "tool_use" || nested.type === "tool_result") live.currentEvents.push(nested);
+      if (nested.type === "tool_use" && nested.tool === "Agent" && typeof nested.toolUseId === "string"
+          && nested.toolUseId.startsWith("subagent-")) {
+        live.subagentThreadIds.add(nested.toolUseId.slice("subagent-".length));
+      }
     }
     if (notif.method === "turn/completed") {
       if (live.currentAssistant || live.currentEvents.length) {
@@ -798,6 +836,32 @@ export class CodexAppServerProvider implements AIProvider {
     }
   }
 
+  /** Persist Codex's per-turn token and prompt-cache split for the debug panel. */
+  private recordTurnUsage(live: LiveSession, usage: import("../../shared/turn-usage.ts").TurnUsage): void {
+    const accountId = live.threadId ? getSessionCodexAccount(live.threadId) ?? undefined : undefined;
+    const account = accountId ? getCodexAccount(accountId) : null;
+    try {
+      insertTurnUsage({
+        sessionId: live.threadId ?? "",
+        model: usage.model,
+        inputTokens: usage.inputTokens,
+        outputTokens: usage.outputTokens,
+        cacheReadTokens: usage.cacheReadTokens,
+        cacheWriteTokens: usage.cacheWriteTokens,
+        contextWindow: usage.contextWindow,
+        costUsd: usage.costUsd,
+        // A cache miss alone does not prove a process restart: a first turn and
+        // an evicted prompt cache look the same on the wire. Keep this false
+        // until the provider has an explicit lifecycle reason to record.
+        coldStart: false,
+        ...(accountId ? { accountId } : {}),
+        ...(account?.label ? { accountLabel: account.label } : {}),
+      });
+    } catch (err) {
+      console.warn(`[usage] failed to persist codex usage: ${(err as Error).message}`);
+    }
+  }
+
   private handleServerRequest(live: LiveSession, req: ServerRequest): void {
     const method = req.method;
     if (isApprovalMethod(method)) {

package/src/server/routes/chat.ts

@@ -19,6 +19,8 @@ import { parseJsonlTranscript, validateJsonlPath } from "../../services/jsonl-tr
 import { aggregateTasks } from "../../services/task-status-aggregator.ts";
 import { MANY_IMAGE_DIMENSION_LIMIT, type StripMode } from "../../services/transcript-images.ts";
 import { auditTranscriptImagesFile, stripTranscriptImagesFile } from "../../services/transcript-images-file.ts";
+import { listCodexAccounts } from "../../services/codex-account.service.ts";
+import { findRolloutByThreadId } from "../../providers/codex-app-server/codex-history.ts";
 import { getSessionProjectPath, setSessionMetadata, setSessionTitle, getSessionTitle, getPinnedSessionIds, pinSession, unpinSession, deleteSessionMapping, deleteSessionMetadata, deleteSessionTitle, getAllUnread, clearSessionUnread, setSessionUnread } from "../../services/db.service.ts";
 import { setSessionTag, bulkSetSessionTag, getTagById, getSessionTags, getProjectDefaultTagId } from "../../services/tag.service.ts";
 import { recordBranch, resolveVersionGroup, resolveVersionMap, collapseTreesToHeads, hasChildren, deleteBranchesFor, getRootId } from "../../services/session-branch.service.ts";
@@ -469,8 +471,11 @@ chatRoutes.patch("/sessions/:id", async (c) => {
     const projectPath = c.get("projectPath");
     // Persist to PPM DB (authoritative source for user-set titles)
     setSessionTitle(id, title);
-    // Also persist to SDK so Claude Code CLI sees the custom title
-    await sdkRenameSession(id, title, { dir: projectPath });
+    // Codex owns its rollout title and has no Claude SDK session to rename.
+    // PPM's title table is the authoritative title for both providers.
+    if (getSessionProvider(id) !== "codex") {
+      await sdkRenameSession(id, title, { dir: projectPath });
+    }
     // Also update in-memory session
     const session = chatService.getSession(id);
     if (session) session.title = title;
@@ -763,9 +768,22 @@ chatRoutes.get("/sessions/:id/logs", (c) => {
  */
 function resolveSessionJsonlPath(sessionId: string): { jsonlPath: string; jsonlDir: string; projectPath: string; exists: boolean } {
   const homedir = process.env.HOME ?? process.env.USERPROFILE ?? "";
+  const providerId = getSessionProvider(sessionId);
+  const storedProjectPath = getSessionProjectPath(sessionId) ?? "";
+  if (providerId === "codex") {
+    const dirs = [
+      ...listCodexAccounts().map((account) => join(account.home, "sessions")),
+      ...(homedir ? [resolve(homedir, ".codex", "sessions")] : []),
+    ];
+    for (const dir of dirs) {
+      const found = findRolloutByThreadId(dir, sessionId, storedProjectPath || undefined);
+      if (found) return { jsonlPath: found, jsonlDir: dir, projectPath: storedProjectPath, exists: true };
+    }
+    return { jsonlPath: "", jsonlDir: "", projectPath: storedProjectPath, exists: false };
+  }
   const provider = providerRegistry.get("claude") as any;
   const projectPath = provider?.activeSessions?.get(sessionId)?.projectPath
-    ?? getSessionProjectPath(sessionId)
+    ?? storedProjectPath
     ?? "";
   const projectsRoot = homedir ? resolve(homedir, ".claude", "projects") : "";
   // SDK encodes cwd by replacing path separators + drive colon with "-".
@@ -815,6 +833,7 @@ chatRoutes.get("/sessions/:id/debug", (c) => {
   return c.json(ok({
     ppmSessionId: sessionId,
     sdkSessionId: sessionId,
+    providerId: getSessionProvider(sessionId) ?? "claude",
     sessionId,
     jsonlPath: exists ? jsonlPath : null,
     jsonlDir,

package/src/server/ws/chat.ts

@@ -333,7 +333,7 @@ function bufferAndBroadcast(sessionId: string, event: unknown): void {
         for (let i = entry.turnEvents.length - 1; i >= 0; i--) {
           const buffered = entry.turnEvents[i] as any;
           if (buffered.type === "tool_use" && buffered.toolUseId === toolUseId) {
-            buffered.result = { output: (event as any).output, isError: (event as any).isError };
+            buffered.result = { output: (event as any).output, isError: (event as any).isError, exitCode: (event as any).exitCode };
             break;
           }
         }
@@ -1286,10 +1286,15 @@ export const chatWebSocket = {
       } else {
         // Follow-up: push into existing generator via provider
         if (provider && "pushMessage" in provider && parsed.type === "message") {
+          const effort = getSessionEffort(sessionId) ?? undefined;
+          const thinkingBudget = getSessionThinking(sessionId);
           (provider as any).pushMessage(sessionId, parsed.content, {
             priority: parsed.priority ?? 'next',
             images: parsed.images,
             imagePaths: parsed.imagePaths,
+            ...(entry.model ? { model: entry.model } : {}),
+            ...(effort ? { effort } : {}),
+            ...(thinkingBudget != null ? { thinkingBudget } : {}),
           });
         }
         // Clear turn events for new turn display + transition phase