@cydm/pie 2.3.0 → 2.5.0

package/dist/builtin/skills/skill-creator/scripts/pie_runner.mjs

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 
 import crypto from "node:crypto";
-import { spawn } from "node:child_process";
+import { execFile, spawn } from "node:child_process";
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { promisify } from "node:util";
 
 const SCRIPT_DIR = path.dirname(fileURLToPath(import.meta.url));
+const execFileAsync = promisify(execFile);
 
 export function findProjectRoot(start = process.cwd()) {
   return path.resolve(start);
@@ -62,11 +63,30 @@ export function getPieCliPath() {
   );
 }
 
+async function readLastAssistant(sessionId, cwd, deadline) {
+  let before;
+  do {
+    // Skills ship as plain scripts; use the bundled CLI's storage API instead
+    // of importing workspace-only packages or depending on its disk layout.
+    const { stdout } = await execFileAsync(process.execPath, [
+      getPieCliPath(), "sessions", "read", sessionId, "--json", "--fields", "message", "--limit", "1",
+      ...(before ? ["--before", before] : []),
+    ], { cwd, windowsHide: true, timeout: Math.max(1, deadline - Date.now()), maxBuffer: 16 * 1024 * 1024 });
+    const page = JSON.parse(stdout);
+    if (!page.ok) throw new Error(page.error?.message || "Could not read session");
+    const message = page.data?.events?.at(-1)?.message;
+    if (message?.role === "assistant") return message;
+    before = page.meta?.hasMoreBefore ? page.meta.nextBefore : null;
+  } while (before);
+  return null;
+}
+
 export async function runPieJsonPrompt(prompt, { cwd = process.cwd(), timeout = 300_000, sessionId = null, model = null } = {}) {
   if (model && (typeof model !== "string" || !/^[^/\s]+\/\S+$/.test(model))) {
     throw new Error("Model must use profile/modelId format.");
   }
   return new Promise((resolve, reject) => {
+    const deadline = Date.now() + timeout;
     const id = sessionId || `skill-run-${uuidFragment()}`;
     const turnId = `skill-turn-${uuidFragment()}`;
     const args = [getPieCliPath(), "--json-events", "--event-detail", "full", "--session-id", id];
@@ -141,27 +161,28 @@ export async function runPieJsonPrompt(prompt, { cwd = process.cwd(), timeout =
     child.on("error", (error) => {
       finish(() => reject(error));
     });
-    child.on("close", (code) => {
+    child.on("close", async (code) => {
+      if (settled) return;
       if (buffer.trim()) consume(buffer.trim());
       if (code !== 0 || !turnSettled || !response) {
         finish(() => reject(new Error(`pie prompt exited ${code} without a settled response\nstderr: ${stderr}`)));
         return;
       }
-      const configuredDir = process.env.PIE_CODING_AGENT_DIR || path.join(os.homedir(), ".pie");
-      const configDir = configuredDir === "~" ? os.homedir()
-        : configuredDir.startsWith("~/") ? path.join(os.homedir(), configuredDir.slice(2)) : configuredDir;
       let actualModel = null;
       try {
-        const session = JSON.parse(fs.readFileSync(path.join(configDir, "sessions", `${id}.json`), "utf8"));
-        const metadata = session.metadata || {};
-        if (metadata.provider && metadata.modelId) actualModel = `${metadata.provider}/${metadata.modelId}`;
-        const messages = session.messages || (session.entries || []).map((entry) => entry.message).filter(Boolean);
-        const lastAssistant = messages.filter((message) => message.role === "assistant").at(-1);
+        const lastAssistant = await readLastAssistant(id, cwd, deadline);
+        if (lastAssistant?.provider && lastAssistant.model) actualModel = `${lastAssistant.provider}/${lastAssistant.model}`;
+        if (response.ok && !lastAssistant) throw new Error("No assistant reply in completed session");
         if (response.ok && lastAssistant) {
           response.text = typeof lastAssistant.content === "string" ? lastAssistant.content
             : (lastAssistant.content || []).filter((block) => block.type === "text").map((block) => block.text).join("");
         }
-      } catch {}
+      } catch (error) {
+        if (response.ok) {
+          finish(() => reject(new Error(`Could not read completed Pie session: ${error.message}`)));
+          return;
+        }
+      }
       if (model && response.ok && actualModel !== model) {
         finish(() => reject(new Error(`Requested model ${model}, but session reported ${actualModel || "no model"}.`)));
         return;

package/dist/builtin/skills/tui-use/tui-use-daemon.cjs

@@ -7049,10 +7049,10 @@ async function matchLines(lines, pattern, regex = false, signal) {
 // vendor/tui-use/src/executable.ts
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_path2 = __toESM(require("node:path"));
-function resolveExecutable(file, cwd = process.cwd()) {
+function resolveExecutable(file, cwd = process.cwd(), env = process.env) {
   if (process.platform !== "win32") return file;
   if (/^node(?:\.exe)?$/i.test(file)) return process.execPath;
-  const dirs = file.includes("/") || file.includes("\\") || import_node_path2.default.isAbsolute(file) ? [cwd] : [cwd, ...(process.env.PATH ?? "").split(import_node_path2.default.delimiter)];
+  const dirs = file.includes("/") || file.includes("\\") || import_node_path2.default.isAbsolute(file) ? [cwd] : [cwd, ...(env.PATH ?? "").split(import_node_path2.default.delimiter)];
   const extensions = import_node_path2.default.extname(file) ? [""] : ["", ".exe", ".com"];
   for (const dir of dirs) {
     for (const extension of extensions) {
@@ -7248,7 +7248,8 @@ var Session = class {
     this.startTime = Date.now();
     const cols = options.cols ?? 120;
     const rows = options.rows ?? 30;
-    const shell = options.argv ? { file: resolveExecutable(options.argv[0], options.cwd), args: options.argv.slice(1) } : commandShell(command);
+    const env = options.env ?? process.env;
+    const shell = options.argv ? { file: resolveExecutable(options.argv[0], options.cwd, env), args: options.argv.slice(1) } : commandShell(command, process.platform, env);
     this.terminal = new import_headless.Terminal({ cols, rows, allowProposedApi: true, scrollback: 1e4 });
     configureUnicode(this.terminal);
     this._isFullscreen = extractIsFullscreen(this.terminal.buffer);
@@ -7267,10 +7268,7 @@ var Session = class {
         rows,
         useConptyDll: process.platform === "win32",
         cwd: options.cwd ?? process.cwd(),
-        // The caller's env, not the daemon starter's: a persistent daemon
-        // outlives many projects, and each session must see the environment
-        // of the shell that started it (PATH setups, PIE_* overrides, ...).
-        env: options.env ?? process.env
+        env
       });
     } catch (error) {
       this.terminal.dispose();