@opencrater/sdk 0.8.48 → 0.8.50

package/dist/paint.js

@@ -298,16 +298,29 @@ var WIN_PUMP_PS = [
   // parent chain, attach to each ancestor, and keep the first console that is
   // NOT the 9001-row hidden buffer — that is the one with a window on screen.
   "$self=Csbi (OpenConout); if($self){ L ('pump: SELF bufH='+$self.sz.Y+' winRows='+($self.win.B-$self.win.T+1)+' curY='+$self.cur.Y) }",
-  "$par=@{}; try{ Get-CimInstance Win32_Process -ErrorAction Stop | ForEach-Object { $par[[int]$_.ProcessId]=[int]$_.ParentProcessId } }catch{ L 'pump: WMI walk failed' }",
-  "$chain=New-Object System.Collections.ArrayList; $p=$PID; for($i=0;$i -lt 12;$i++){ if(-not $par.ContainsKey($p)){break}; $pp=$par[$p]; if($pp -le 4){break}; $nm='?'; try{ $nm=(Get-Process -Id $pp -ErrorAction Stop).ProcessName }catch{}; [void]$chain.Add(@{id=$pp;name=$nm}); $p=$pp }",
-  "L ('pump: ancestors = ' + (($chain | ForEach-Object { $_.name+'('+$_.id+')' }) -join ' -> '))",
   "$how='self'; $winId=0",
-  "foreach($c in $chain){ [void][OCP.N]::FreeConsole(); if([OCP.N]::AttachConsole([uint32]$c.id)){ $b=Csbi (OpenConout); if($b){ L ('pump: '+$c.name+'('+$c.id+') bufH='+$b.sz.Y+' winRows='+($b.win.B-$b.win.T+1)+' curY='+$b.cur.Y); if($winId -eq 0 -and $b.sz.Y -lt 1000){ $winId=$c.id; $how=('attach:'+$c.name) } } } }",
+  // Given an explicit console-owner PID (the escaped painter passes it — its
+  // own parent chain is WmiPrvSE, so the walk below would never find Windows
+  // Terminal), attach to it directly and skip discovery.
+  "$given=[int]($env:OPENCRATER_WIN_CONSOLE_PID)",
+  "if($given -gt 0){ [void][OCP.N]::FreeConsole(); if([OCP.N]::AttachConsole([uint32]$given)){ $winId=$given; $how='given' } L ('pump: given console pid '+$given+' attached='+($winId -eq $given)) }",
+  "if($winId -eq 0){",
+  "  $par=@{}; try{ Get-CimInstance Win32_Process -ErrorAction Stop | ForEach-Object { $par[[int]$_.ProcessId]=[int]$_.ParentProcessId } }catch{ L 'pump: WMI walk failed' }",
+  "  $chain=New-Object System.Collections.ArrayList; $p=$PID; for($i=0;$i -lt 12;$i++){ if(-not $par.ContainsKey($p)){break}; $pp=$par[$p]; if($pp -le 4){break}; $nm='?'; try{ $nm=(Get-Process -Id $pp -ErrorAction Stop).ProcessName }catch{}; [void]$chain.Add(@{id=$pp;name=$nm}); $p=$pp }",
+  "  L ('pump: ancestors = ' + (($chain | ForEach-Object { $_.name+'('+$_.id+')' }) -join ' -> '))",
+  "  foreach($c in $chain){ [void][OCP.N]::FreeConsole(); if([OCP.N]::AttachConsole([uint32]$c.id)){ $b=Csbi (OpenConout); if($b){ L ('pump: '+$c.name+'('+$c.id+') bufH='+$b.sz.Y+' winRows='+($b.win.B-$b.win.T+1)+' curY='+$b.cur.Y); if($winId -eq 0 -and $b.sz.Y -lt 1000){ $winId=$c.id; $how=('attach:'+$c.name) } } } }",
+  "}",
   "[void][OCP.N]::FreeConsole()",
   "if($winId -ne 0){ [void][OCP.N]::AttachConsole([uint32]$winId) } else { [void][OCP.N]::AttachConsole(0xFFFFFFFF); $how='attach-parent' }",
   "$h=OpenConout",
   "if($h -eq [IntPtr]-1){ L 'pump: NO CONSOLE after attach walk'; exit 1 }",
   "$fb=Csbi $h; if($fb){ L ('pump: FINAL via '+$how+' bufH='+$fb.sz.Y+' winRows='+($fb.win.B-$fb.win.T+1)+' curY='+$fb.cur.Y) } else { L ('pump: FINAL via '+$how) }",
+  // Report the REAL visible-console size back to the painter (over stdout, a
+  // pipe — the card itself goes to CONOUT$ via WriteFile, so this channel is
+  // free). The painter blocks on this line, then anchors the card to the true
+  // right edge. win.R/L/B/T are the on-screen window rect (not the scrollback
+  // buffer), so this is exactly what `mode con` SHOULD have returned.
+  "if($fb){ $cols=$fb.win.R-$fb.win.L+1; $rows=$fb.win.B-$fb.win.T+1; [Console]::Out.WriteLine('OCWIN '+$winId+' '+$cols+' '+$rows); [Console]::Out.Flush() }",
   "$m=[uint32]0;[void][OCP.N]::GetConsoleMode($h,[ref]$m);[void][OCP.N]::SetConsoleMode($h,($m -bor 4));[void][OCP.N]::SetConsoleOutputCP(65001)",
   // Stream frames straight to the console as they arrive. The painter drives
   // the timing — it repaints the overlay (live countdown, position defence)
@@ -337,7 +350,7 @@ function spawnWindowsConsoleSink() {
     }
     pdebug("spawning pump:", exe);
     const child = child_process.spawn(exe, ["-NoProfile", "-NonInteractive", "-EncodedCommand", b64], {
-      stdio: ["pipe", errStdio, errStdio],
+      stdio: ["pipe", "pipe", errStdio],
       windowsHide: false
     });
     child.on("error", (e) => pdebug("pump spawn error:", exe, "-", e.message));
@@ -353,7 +366,32 @@ function spawnWindowsConsoleSink() {
     child.on("exit", () => {
       exited = true;
     });
+    const size = new Promise((resolve) => {
+      let acc = "";
+      let settled = false;
+      const done = (v) => {
+        if (!settled) {
+          settled = true;
+          resolve(v);
+        }
+      };
+      const out = child.stdout;
+      if (!out) return done(null);
+      out.setEncoding("utf8");
+      out.on("data", (chunk) => {
+        acc += chunk;
+        const m = acc.match(/OCWIN\s+(\d+)\s+(\d+)\s+(\d+)/);
+        if (m) {
+          pdebug("pump reported console pid", m[1], "size", m[2] + "x" + m[3]);
+          done({ pid: Number(m[1]), cols: Number(m[2]), rows: Number(m[3]) });
+        }
+      });
+      out.on("error", () => done(null));
+      out.on("end", () => done(null));
+      setTimeout(() => done(null), 2500);
+    });
     return {
+      size,
       write: (d) => {
         try {
           stdin.write(d);
@@ -389,6 +427,50 @@ function spawnWindowsConsoleSink() {
     return null;
   }
 }
+function wmiSpawnDetached(cmdLine) {
+  try {
+    const esc = cmdLine.replace(/'/g, "''");
+    const ps = `$ErrorActionPreference='Stop';try{$r=Invoke-CimMethod -ClassName Win32_Process -MethodName Create -Arguments @{CommandLine='${esc}'};if($r.ReturnValue -eq 0){[Console]::Out.Write('OCPID '+$r.ProcessId)}else{[Console]::Out.Write('OCERR rv='+$r.ReturnValue)}}catch{[Console]::Out.Write('OCERR '+$_.Exception.Message)}`;
+    const b64 = Buffer.from(ps, "utf16le").toString("base64");
+    const res = child_process.spawnSync(
+      powershellPath(),
+      ["-NoProfile", "-NonInteractive", "-EncodedCommand", b64],
+      { timeout: 5e3, encoding: "utf8" }
+    );
+    const m = (res.stdout ?? "").match(/OCPID\s+(\d+)/);
+    if (m) return Number(m[1]);
+    pdebug("wmi spawn failed:", (res.stdout ?? "").trim(), "|", (res.stderr ?? "").trim());
+    return 0;
+  } catch (err) {
+    pdebug("wmi spawn threw", err.message);
+    return 0;
+  }
+}
+function escapeToPersistentPainter(payload, consolePid) {
+  try {
+    const dir = path3__namespace.join(os.homedir(), ".config", "opencrater");
+    fs2.mkdirSync(dir, { recursive: true });
+    const file = path3__namespace.join(dir, `paint-${process.pid}-${Date.now()}.json`);
+    fs2.writeFileSync(file, JSON.stringify(payload), "utf8");
+    const q = (s) => `"${s}"`;
+    const parts = [
+      q(process.execPath),
+      q(__filename),
+      "--persist",
+      "--payload-file",
+      q(file),
+      "--console-pid",
+      String(consolePid)
+    ];
+    if (DEBUG_ON) parts.push("--debug");
+    const pid = wmiSpawnDetached(parts.join(" "));
+    pdebug("escape: wmi persistent painter pid", pid);
+    return pid > 0;
+  } catch (err) {
+    pdebug("escape failed", err.message);
+    return false;
+  }
+}
 function windowsVtOk(env) {
   if (env["WT_SESSION"]) return true;
   if (env["TERM_PROGRAM"]) return true;
@@ -728,9 +810,10 @@ function releaseLock() {
   } catch {
   }
 }
+var DEBUG_ON = process.env["OPENCRATER_DEBUG"] === "1";
 function pdebug(...args) {
   try {
-    if (process.env["OPENCRATER_DEBUG"] !== "1") return;
+    if (!DEBUG_ON) return;
     const line = `[opencrater-paint] ${args.map((a) => String(a)).join(" ")}`;
     console.error(line);
     try {
@@ -745,16 +828,38 @@ function pdebug(...args) {
   }
 }
 function main() {
-  const raw = process.env["OPENCRATER_PAINT"];
+  const argv = process.argv.slice(2);
+  const argVal = (flag) => {
+    const i = argv.indexOf(flag);
+    return i >= 0 ? argv[i + 1] : void 0;
+  };
+  if (argv.includes("--debug")) {
+    DEBUG_ON = true;
+    process.env["OPENCRATER_DEBUG"] = "1";
+  }
+  const persist = argv.includes("--persist") || process.env["OPENCRATER_WIN_PERSIST"] === "1";
+  const consolePidArg = Number(argVal("--console-pid") ?? "0");
+  if (consolePidArg > 0) {
+    process.env["OPENCRATER_WIN_CONSOLE_PID"] = String(consolePidArg);
+  }
+  const payloadFile = argVal("--payload-file");
+  let raw = process.env["OPENCRATER_PAINT"];
+  if (payloadFile) {
+    try {
+      raw = fs2.readFileSync(payloadFile, "utf8");
+    } catch (err) {
+      pdebug("payload-file unreadable:", err.message);
+    }
+  }
   if (!raw) {
-    pdebug("no OPENCRATER_PAINT payload in env \u2014 nothing to draw");
+    pdebug("no paint payload (env or --payload-file) \u2014 nothing to draw");
     return;
   }
   let payload;
   try {
     payload = JSON.parse(raw);
   } catch (err) {
-    pdebug("OPENCRATER_PAINT payload is not valid JSON:", err.message);
+    pdebug("paint payload is not valid JSON:", err.message);
     return;
   }
   const ttyPath = process.env["OPENCRATER_TTY"] ?? "/dev/tty";
@@ -807,13 +912,13 @@ function main() {
   }
   const mediaRowCount = isVisualMedia ? Math.max(8, Math.min(16, Math.floor((termRows - 14) / 2) * 2)) : MEDIA_ROWS;
   const effectiveRows = sideMedia ? 5 : mediaRowCount;
-  const width = Math.min(maxWidth, cols - 4);
+  let width = Math.min(maxWidth, cols - 4);
   if (width < 24) {
     sink.close();
     return;
   }
-  const inner = width - 4;
-  const col = Math.max(1, cols - width - 1);
+  let inner = width - 4;
+  let col = Math.max(1, cols - width - 1);
   const startRow = 2;
   const painterStartedAt = Date.now();
   const dim = color ? `${ESC}[2m` : "";
@@ -1319,12 +1424,42 @@ function main() {
   };
   if (IS_WINDOWS) {
     void (async () => {
+      const real = sink.size ? await sink.size : null;
+      if (real && real.cols >= 24) {
+        cols = real.cols;
+        width = Math.min(maxWidth, cols - 4);
+        inner = width - 4;
+        col = Math.max(1, cols - width - 1);
+        pdebug("windows geometry from pump:", "cols", cols, "width", width, "col", col, "ownerPid", real.pid);
+      }
       if (format === "image" || format === "logo" || format === "gif" || format === "video") {
         await upgradeVisual();
       } else if (format === "audio") {
         await upgradeAudio();
       }
       if (payload.audioUrl && format !== "audio") void upgradeAudio(payload.audioUrl);
+      if (persist) {
+        const duration2 = Math.min(Math.max(payload.durationMs ?? DEFAULT_DURATION_MS, 3e3), 12e4);
+        deadlineAt = Date.now() + duration2;
+        if (payloadFile) {
+          try {
+            fs2.unlinkSync(payloadFile);
+          } catch {
+          }
+        }
+        const framesNow = ansiFrames;
+        const animated = !!(framesNow && framesNow.length > 1);
+        paint();
+        interval = setInterval(paint, animated ? ANIM_MS : REPAINT_MS);
+        setTimeout(() => cleanup(), duration2);
+        return;
+      }
+      const ownerPid = real?.pid ?? 0;
+      if (ownerPid > 0 && escapeToPersistentPainter(payload, ownerPid)) {
+        sink.close();
+        process.exit(0);
+      }
+      pdebug("no job-escape (ownerPid", ownerPid, ") \u2014 bounded toast fallback");
       const envHold = Number(process.env["OPENCRATER_WIN_HOLD_MS"]);
       const holdMs = envHold > 0 ? envHold : Math.min(payload.durationMs ?? DEFAULT_DURATION_MS, 5e3);
       deadlineAt = Date.now() + holdMs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrater/sdk",
-  "version": "0.8.48",
+  "version": "0.8.50",
   "description": "OpenCrater SDK — sponsor cards for CLI tools and MCP servers. Fail-silent, zero dependencies.",
   "keywords": [
     "opencrater",