@co0ontty/wand 1.18.12 → 1.21.4

package/dist/session-logger.d.ts

@@ -24,10 +24,13 @@ export interface ShortcutLogContext {
  * SessionLogger saves raw session content to local files for debugging and analysis.
  *
  * Directory structure: .wand/sessions/{sessionId}/
- *   - pty-output.log       Raw PTY output (current, rotated when > 50 MB)
- *   - pty-output.log.1..3  Rotated PTY output backups
- *   - stream-events.jsonl  NDJSON events from native mode (append-only)
- *   - messages.json        Final structured messages (overwritten on each update)
+ *   - pty-output.log              Raw PTY output (current, rotated when > 50 MB)
+ *   - pty-output.log.1..3         Rotated PTY output backups
+ *   - stream-events.jsonl         NDJSON events from native mode (append-only)
+ *   - messages.json               Final structured messages (overwritten on each update)
+ *   - structured-stdout.log       Raw stdout from `codex exec` / `claude -p` child (append-only)
+ *   - structured-stderr.log       Raw stderr from the same child (append-only)
+ *   - structured-spawns.jsonl     One line per spawn: args/pid/cwd/exit/error metadata
  */
 export declare class SessionLogger {
     private readonly baseDir;
@@ -48,6 +51,14 @@ export declare class SessionLogger {
     readPtyOutput(sessionId: string): string | null;
     /** Append a native mode NDJSON event */
     appendStreamEvent(sessionId: string, event: unknown): void;
+    /** Append raw stdout chunk from a structured-mode child process. */
+    appendStructuredStdout(sessionId: string, chunk: string): void;
+    /** Append raw stderr chunk from a structured-mode child process. */
+    appendStructuredStderr(sessionId: string, chunk: string): void;
+    /** Append a spawn metadata record (args, pid, cwd, exit, errors, …) for a structured run. */
+    appendStructuredSpawn(sessionId: string, meta: Record<string, unknown>): void;
+    /** Read recent stderr tail (for surfacing in failure messages). */
+    readStructuredStderrTail(sessionId: string, maxBytes?: number): string;
     /** Save the current structured messages snapshot */
     saveMessages(sessionId: string, messages: ConversationTurn[]): void;
     /** Save session metadata */

package/dist/session-logger.js

@@ -12,10 +12,13 @@ const DEFAULT_SHORTCUT_LOG_MAX_BYTES = 10 * 1024 * 1024;
  * SessionLogger saves raw session content to local files for debugging and analysis.
  *
  * Directory structure: .wand/sessions/{sessionId}/
- *   - pty-output.log       Raw PTY output (current, rotated when > 50 MB)
- *   - pty-output.log.1..3  Rotated PTY output backups
- *   - stream-events.jsonl  NDJSON events from native mode (append-only)
- *   - messages.json        Final structured messages (overwritten on each update)
+ *   - pty-output.log              Raw PTY output (current, rotated when > 50 MB)
+ *   - pty-output.log.1..3         Rotated PTY output backups
+ *   - stream-events.jsonl         NDJSON events from native mode (append-only)
+ *   - messages.json               Final structured messages (overwritten on each update)
+ *   - structured-stdout.log       Raw stdout from `codex exec` / `claude -p` child (append-only)
+ *   - structured-stderr.log       Raw stderr from the same child (append-only)
+ *   - structured-spawns.jsonl     One line per spawn: args/pid/cwd/exit/error metadata
  */
 export class SessionLogger {
     baseDir;
@@ -122,6 +125,51 @@ export class SessionLogger {
             // Non-critical
         }
     }
+    /** Append raw stdout chunk from a structured-mode child process. */
+    appendStructuredStdout(sessionId, chunk) {
+        try {
+            const dir = this.ensureDir(sessionId);
+            appendFileSync(path.join(dir, "structured-stdout.log"), chunk);
+        }
+        catch {
+            // Non-critical
+        }
+    }
+    /** Append raw stderr chunk from a structured-mode child process. */
+    appendStructuredStderr(sessionId, chunk) {
+        try {
+            const dir = this.ensureDir(sessionId);
+            appendFileSync(path.join(dir, "structured-stderr.log"), chunk);
+        }
+        catch {
+            // Non-critical
+        }
+    }
+    /** Append a spawn metadata record (args, pid, cwd, exit, errors, …) for a structured run. */
+    appendStructuredSpawn(sessionId, meta) {
+        try {
+            const dir = this.ensureDir(sessionId);
+            const entry = JSON.stringify({ ts: new Date().toISOString(), ...meta }) + "\n";
+            appendFileSync(path.join(dir, "structured-spawns.jsonl"), entry);
+        }
+        catch {
+            // Non-critical
+        }
+    }
+    /** Read recent stderr tail (for surfacing in failure messages). */
+    readStructuredStderrTail(sessionId, maxBytes = 4096) {
+        try {
+            const dir = this.ensureDir(sessionId);
+            const filePath = path.join(dir, "structured-stderr.log");
+            if (!existsSync(filePath))
+                return "";
+            const content = readFileSync(filePath, "utf8");
+            return content.length <= maxBytes ? content : content.slice(content.length - maxBytes);
+        }
+        catch {
+            return "";
+        }
+    }
     /** Save the current structured messages snapshot */
     saveMessages(sessionId, messages) {
         try {

package/dist/structured-session-manager.d.ts

@@ -1,9 +1,11 @@
+import { SessionLogger } from "./session-logger.js";
 import { WandStorage } from "./storage.js";
-import { ExecutionMode, ProcessEvent, SessionRunner, SessionSnapshot, WandConfig } from "./types.js";
+import { ExecutionMode, ProcessEvent, SessionProvider, SessionRunner, SessionSnapshot, WandConfig } from "./types.js";
 interface CreateStructuredSessionOptions {
     cwd: string;
     mode: ExecutionMode;
     prompt?: string;
+    provider?: SessionProvider;
     runner?: SessionRunner;
     worktreeEnabled?: boolean;
     /** 用户指定的 Claude 模型（别名或完整 ID）。留空则 spawn 时不加 --model。 */
@@ -12,12 +14,13 @@ interface CreateStructuredSessionOptions {
 export declare class StructuredSessionManager {
     private readonly storage;
     private readonly config;
+    private readonly logger;
     private readonly sessions;
     private readonly pendingChildren;
     private readonly interruptedWith;
     private emitEvent;
     private archiveTimer;
-    constructor(storage: WandStorage, config: WandConfig);
+    constructor(storage: WandStorage, config: WandConfig, logger?: SessionLogger | null);
     private archiveExpiredSessions;
     setEventEmitter(emitEvent: (event: ProcessEvent) => void): void;
     list(): SessionSnapshot[];
@@ -49,6 +52,8 @@ export declare class StructuredSessionManager {
     private resolvePermission;
     private incrementApprovalStats;
     private buildPermissionArgs;
+    private buildCodexArgs;
+    private runCodexStreaming;
     /**
      * Spawn `claude -p --output-format stream-json` and parse NDJSON lines as
      * they arrive, emitting incremental WebSocket events so the UI can render
@@ -65,7 +70,12 @@ export declare class StructuredSessionManager {
     private compactContentBlocks;
     private normalizeToolInput;
     private normalizeToolResultContent;
+    private extractCodexText;
+    private extractCodexItemBlock;
+    private upsertCodexBlock;
+    private finishStructuredFailure;
     private extractModelName;
     private extractUsage;
+    private extractCodexUsage;
 }
 export {};