pi-openai-codex-compat 0.0.10-alpha.5 → 0.0.10-alpha.6

package/CHANGELOG.md

@@ -21,7 +21,10 @@
 - Show effective unified-exec yield durations beside accent-colored command
   tool titles, include explicit working directories, emphasize commands on
   their own separated rows, separate `apply_patch` results, and mute command
-  output and protocol metadata.
+  output and protocol metadata. Show yielded `exec_command` session IDs on
+  their title line, and identify `write_stdin` polls in the title and with the
+  original command, working directory, and session ID without repeating that
+  context for writes.
 - Stream live `exec_command`, `write_stdin`, and `shell_command` output in the
   TUI while each tool call is running instead of hiding updates until it exits
   or yields.

package/extensions/openai-codex-compat/command-render.ts

@@ -6,12 +6,12 @@ import {
 } from "./codex-tool-surface.ts";
 import { DEFAULT_CONFIG } from "./config.ts";
 
-type CommandRenderContext = {
+export type CommandRenderContext = {
   isError: boolean;
   isPartial: boolean;
 };
 
-type CommandCallRenderContext = CommandRenderContext & {
+export type CommandCallRenderContext = CommandRenderContext & {
   executionStarted: boolean;
 };
 
@@ -19,6 +19,12 @@ type CommandRenderResult = {
   content: Array<{ type: string; text?: string }>;
 };
 
+type CommandCallMetadata = {
+  sessionId?: number;
+};
+
+type CommandCallMetadataSource = CommandCallMetadata | (() => CommandCallMetadata);
+
 type CommandOutputPreviewLine = {
   text: string;
   sourceLine?: number;
@@ -145,6 +151,59 @@ class CommandResultComponent implements Component {
   }
 }
 
+class CommandCallComponent implements Component {
+  private readonly text: Text;
+  private readonly title: string;
+  private readonly yieldLabel: string;
+  private readonly workdirLabel: string;
+  private readonly summary: string;
+  private readonly theme: RenderTheme;
+  private readonly metadata: CommandCallMetadataSource;
+  private renderedSessionId: number | undefined;
+
+  constructor(
+    title: string,
+    yieldLabel: string,
+    workdirLabel: string,
+    summary: string,
+    theme: RenderTheme,
+    metadata: CommandCallMetadataSource,
+  ) {
+    this.title = title;
+    this.yieldLabel = yieldLabel;
+    this.workdirLabel = workdirLabel;
+    this.summary = summary;
+    this.theme = theme;
+    this.metadata = metadata;
+    this.renderedSessionId = this.resolveSessionId();
+    this.text = new Text(this.renderText(this.renderedSessionId), 0, 0);
+  }
+
+  render(width: number): string[] {
+    const sessionId = this.resolveSessionId();
+    if (sessionId !== this.renderedSessionId) {
+      this.renderedSessionId = sessionId;
+      this.text.setText(this.renderText(sessionId));
+    }
+    return this.text.render(width);
+  }
+
+  invalidate(): void {
+    this.text.invalidate();
+  }
+
+  private resolveSessionId(): number | undefined {
+    const metadata = typeof this.metadata === "function" ? this.metadata() : this.metadata;
+    return metadata.sessionId;
+  }
+
+  private renderText(sessionId: number | undefined): string {
+    const sessionLabel =
+      sessionId === undefined ? "" : `  ${this.theme.fg("muted", `[session id: ${sessionId}]`)}`;
+    return `${this.title}${sessionLabel}${this.yieldLabel}${this.workdirLabel}\n\n${this.summary}`;
+  }
+}
+
 export function renderCommandCall(
   toolName: string,
   command: string,
@@ -153,13 +212,14 @@ export function renderCommandCall(
   theme: RenderTheme,
   context: CommandCallRenderContext,
   resolveBackground: CodexToolBackgroundResolver = () => DEFAULT_CONFIG.toolBackground,
+  metadata: CommandCallMetadataSource = {},
 ): Component {
   const title = theme.fg("accent", theme.bold(toolName));
   const yieldLabel = yieldDuration ? `  ${theme.fg("muted", `[yield: ${yieldDuration}]`)}` : "";
   const workdirLabel = workdir ? `  ${theme.fg("muted", `[workdir: ${workdir}]`)}` : "";
   const summary = theme.fg("text", command || "…");
   return new CodexToolSurfaceComponent(
-    new Text(`${title}${yieldLabel}${workdirLabel}\n\n${summary}`, 0, 0),
+    new CommandCallComponent(title, yieldLabel, workdirLabel, summary, theme, metadata),
     theme,
     {
       background: resolveBackground,

package/extensions/openai-codex-compat/command-tools.ts

@@ -10,14 +10,19 @@ import {
   type WriteStdinRequest,
 } from "./command-runtime.ts";
 import type { CommandProcessSpawner } from "./command-process.ts";
+import type { CommandOutputDetails } from "./command-output.ts";
 import {
   commandShellDisplayName,
   resolveCommandShellCatalog,
   type CommandShellCatalog,
 } from "./command-shell.ts";
-import type { CodexToolBackgroundResolver } from "./codex-tool-surface.ts";
+import type { CodexToolBackgroundResolver, RenderTheme } from "./codex-tool-surface.ts";
 import { DEFAULT_CONFIG } from "./config.ts";
-import { renderCommandCall, renderCommandResult } from "./command-render.ts";
+import {
+  renderCommandCall,
+  renderCommandResult,
+  type CommandCallRenderContext,
+} from "./command-render.ts";
 import {
   EXEC_COMMAND_PARAMETERS,
   EXEC_COMMAND_TOOL_NAME,
@@ -57,6 +62,20 @@ export type CommandToolsController = {
   terminateUnifiedExecSessions: () => void;
 };
 
+export type WriteStdinRenderProcess = {
+  sessionId: number;
+  command: string;
+  workdir: string;
+};
+
+type WriteStdinRenderState = {
+  polledProcess?: WriteStdinRenderProcess;
+};
+
+type ExecCommandRenderState = {
+  sessionId?: number;
+};
+
 // Pi validates the prepared value against SHELL_COMMAND_PARAMETERS immediately
 // after this compatibility rewrite.
 export function prepareShellCommandArguments(
@@ -75,14 +94,59 @@ export function prepareShellCommandArguments(args: unknown): unknown {
   return prepared;
 }
 
-function writeStdinSummary(request: Partial<WriteStdinRequest>): string {
+function writeStdinSummary(
+  request: Partial<WriteStdinRequest>,
+  polledProcess: WriteStdinRenderProcess | undefined,
+): string {
   const id = typeof request.session_id === "number" ? request.session_id : "?";
   const chars = typeof request.chars === "string" ? request.chars : "";
-  if (!chars) return `poll session ${id}`;
+  if (!chars) return polledProcess?.command ?? `poll session ${id}`;
   const singleLine = chars.replaceAll("\n", "\\n").replaceAll("\r", "\\r");
   return `write ${JSON.stringify(singleLine)} to session ${id}`;
 }
 
+export function renderWriteStdinCall(
+  request: Partial<WriteStdinRequest>,
+  polledProcess: WriteStdinRenderProcess | undefined,
+  yieldDuration: string | undefined,
+  theme: RenderTheme,
+  context: CommandCallRenderContext,
+  resolveBackground: CodexToolBackgroundResolver = () => DEFAULT_CONFIG.toolBackground,
+): ReturnType<typeof renderCommandCall> {
+  const polling = !(request.chars ?? "");
+  const process = polling ? polledProcess : undefined;
+  return renderCommandCall(
+    polling ? `${WRITE_STDIN_TOOL_NAME} (polling)` : WRITE_STDIN_TOOL_NAME,
+    writeStdinSummary(request, process),
+    yieldDuration,
+    process?.workdir,
+    theme,
+    context,
+    resolveBackground,
+    process ? { sessionId: process.sessionId } : {},
+  );
+}
+
+function resolvePolledProcess(
+  request: Partial<WriteStdinRequest>,
+  manager: UnifiedExecManager,
+  state: WriteStdinRenderState,
+): WriteStdinRenderState["polledProcess"] {
+  if ((request.chars ?? "") || typeof request.session_id !== "number") return undefined;
+  if (state.polledProcess?.sessionId === request.session_id) return state.polledProcess;
+  const process = manager.observeProcess(request.session_id)?.();
+  if (!process) {
+    Reflect.deleteProperty(state, "polledProcess");
+    return undefined;
+  }
+  state.polledProcess = {
+    sessionId: process.sessionId,
+    command: process.command,
+    workdir: process.cwd,
+  };
+  return state.polledProcess;
+}
+
 function formatYieldDuration(milliseconds: number): string {
   return milliseconds >= 1_000 ? `${milliseconds / 1_000}s` : `${milliseconds}ms`;
 }
@@ -185,7 +249,7 @@ export default function registerCommandTools(
     },
   });
 
-  pi.registerTool({
+  pi.registerTool<typeof EXEC_COMMAND_PARAMETERS, CommandOutputDetails, ExecCommandRenderState>({
     name: EXEC_COMMAND_TOOL_NAME,
     label: EXEC_COMMAND_TOOL_NAME,
     description: execCommandPrompt.description,
@@ -197,6 +261,7 @@ export default function registerCommandTools(
       return manager.execCommand(params satisfies ExecCommandRequest, ctx, signal, onUpdate);
     },
     renderCall(args, theme, context) {
+      const state = context.state;
       return renderCommandCall(
         EXEC_COMMAND_TOOL_NAME,
         typeof args.cmd === "string" ? args.cmd : "",
@@ -205,14 +270,22 @@ export default function registerCommandTools(
         theme,
         context,
         resolveToolBackground,
+        () => (state.sessionId === undefined ? {} : { sessionId: state.sessionId }),
       );
     },
     renderResult(result, options, theme, context) {
+      if (!options.isPartial) {
+        if (result.details.sessionId === undefined) {
+          Reflect.deleteProperty(context.state, "sessionId");
+        } else {
+          context.state.sessionId = result.details.sessionId;
+        }
+      }
       return renderCommandResult(result, options, theme, context, resolveToolBackground);
     },
   });
 
-  pi.registerTool({
+  pi.registerTool<typeof WRITE_STDIN_PARAMETERS, CommandOutputDetails, WriteStdinRenderState>({
     name: WRITE_STDIN_TOOL_NAME,
     label: WRITE_STDIN_TOOL_NAME,
     description: writeStdinPrompt.description,
@@ -224,13 +297,13 @@ export default function registerCommandTools(
       return manager.writeStdin(params satisfies WriteStdinRequest, signal, onUpdate);
     },
     renderCall(args, theme, context) {
-      return renderCommandCall(
-        WRITE_STDIN_TOOL_NAME,
-        writeStdinSummary(args),
+      const polledProcess = resolvePolledProcess(args, manager, context.state);
+      return renderWriteStdinCall(
+        args,
+        polledProcess,
         resolveYieldDuration(args.yield_time_ms, (value) =>
           effectiveWriteStdinYieldTimeMs(value, !(args.chars ?? "")),
         ),
-        undefined,
         theme,
         context,
         resolveToolBackground,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-openai-codex-compat",
-  "version": "0.0.10-alpha.5",
+  "version": "0.0.10-alpha.6",
   "description": "OpenAI Codex compatibility for Pi with native compaction, fast mode, and Codex-optimized capabilities",
   "keywords": [
     "pi-package"