@gorlitzer-labs/apiary 1.13.5 → 1.13.7

package/dist/cli/index.js

@@ -769,9 +769,9 @@ async function runClaude(options) {
     });
     process.stderr.write(`MCP server: ${setup2.mcpServer.url}
 `);
-    await new Promise((resolve3) => {
-      process.on("SIGINT", resolve3);
-      process.on("SIGTERM", resolve3);
+    await new Promise((resolve4) => {
+      process.on("SIGINT", resolve4);
+      process.on("SIGTERM", resolve4);
     });
     await setup2.cleanup();
     await eventLoopPromise2;
@@ -916,9 +916,9 @@ async function runClaude(options) {
     const noop = (() => true);
     process.stdout.write = noop;
     process.stderr.write = noop;
-    await new Promise((resolve3) => {
-      process.on("SIGTERM", resolve3);
-      process.on("SIGINT", resolve3);
+    await new Promise((resolve4) => {
+      process.on("SIGTERM", resolve4);
+      process.on("SIGINT", resolve4);
     });
     clearInterval(activityTimer);
     clearInterval(metricsTimer);
@@ -948,9 +948,9 @@ async function runClaude(options) {
     const noop = (() => true);
     process.stdout.write = noop;
     process.stderr.write = noop;
-    await new Promise((resolve3) => {
-      process.on("SIGINT", resolve3);
-      process.on("SIGTERM", resolve3);
+    await new Promise((resolve4) => {
+      process.on("SIGINT", resolve4);
+      process.on("SIGTERM", resolve4);
     });
   }
   clearInterval(activityTimer);
@@ -1181,12 +1181,12 @@ async function runOpencode(options) {
   OpenCode agent running.`);
   console.log(`  To watch: opencode attach ${opencodeUrl}
 `);
-  const exitPromise = new Promise((resolve3) => {
-    child.on("exit", resolve3);
+  const exitPromise = new Promise((resolve4) => {
+    child.on("exit", resolve4);
   });
-  const signalPromise = new Promise((resolve3) => {
+  const signalPromise = new Promise((resolve4) => {
     const handler = () => {
-      resolve3();
+      resolve4();
     };
     process.on("SIGINT", handler);
     process.on("SIGTERM", handler);
@@ -1369,7 +1369,11 @@ var BLOCKED_PATTERNS = [
   // `[\s\S]` not `.`: the screen renders these on separate lines, and `.`
   // does not cross a newline, so the original pattern never matched.
   /You are running Codex in [\s\S]+Do you want to allow/,
-  "Do you trust the files in this folder"
+  "Do you trust the files in this folder",
+  // Codex 0.156 reworded the trust prompt; the old string above no longer appears.
+  "Trust this folder?",
+  // The startup update menu ("Update now / Skip") sits in front of the composer too.
+  /Update available[\s\S]+Update now/
 ];
 var STREAMING_PATTERNS = [
   /Working\s*\(\d+[smh]/,
@@ -1657,8 +1661,8 @@ function extractCodexActivityLabel(lines) {
 }
 
 // src/cli/codex/launch.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync2, readdirSync as readdirSync4, rmSync as rmSync2, writeFileSync as writeFileSync3 } from "fs";
-import { join as join6 } from "path";
+import { existsSync as existsSync5, mkdirSync as mkdirSync2, readdirSync as readdirSync4, realpathSync as realpathSync2, rmSync as rmSync2, writeFileSync as writeFileSync3 } from "fs";
+import { join as join6, resolve as resolve2 } from "path";
 import { homedir as homedir5 } from "os";
 var STARTUP_TIMEOUT_SEC = 15;
 var TOOL_TIMEOUT_SEC = 60;
@@ -1679,7 +1683,7 @@ function codexProfileName(agentName) {
 function tomlString(value) {
   return JSON.stringify(value);
 }
-function renderCodexProfile(mcpUrl, approvalMode = codexToolApprovalMode(), unattended = wantsUnattendedAgents()) {
+function renderCodexProfile(mcpUrl, approvalMode = codexToolApprovalMode(), unattended = wantsUnattendedAgents(), trustDirs = []) {
   const blocks = [
     // Top-level keys must precede every table header, or TOML parses them as
     // members of the last table.
@@ -1689,7 +1693,9 @@ function renderCodexProfile(mcpUrl, approvalMode = codexToolApprovalMode(), unat
       "# No approval prompts: nobody is watching this pane, so a prompt is a",
       "# permanent stall. Commands still run inside Codex's sandbox \u2014 anything",
       "# it will not allow returns a failure to the model instead of asking.",
-      'approval_policy = "never"'
+      'approval_policy = "never"',
+      "# The update prompt is a menu in front of the composer: another stall.",
+      "check_for_update_on_startup = false"
     ].join("\n")] : [],
     [
       ...unattended ? [] : ["# Written by apiary. Layered over your own config; deleted when the agent stops."],
@@ -1701,17 +1707,21 @@ function renderCodexProfile(mcpUrl, approvalMode = codexToolApprovalMode(), unat
     ...RUNTIME_TOOL_NAMES.map((tool) => [
       `[mcp_servers.apiary.tools.${tool}]`,
       `approval_mode = ${tomlString(approvalMode)}`
-    ].join("\n"))
+    ].join("\n")),
+    ...unattended ? [...new Set(trustDirs)].map((dir) => [
+      `[projects.${tomlString(dir)}]`,
+      'trust_level = "trusted"'
+    ].join("\n")) : []
   ];
   return blocks.join("\n\n") + "\n";
 }
 function codexProfilePath(agentName, codexHome = userCodexHome()) {
   return join6(codexHome, `${codexProfileName(agentName)}.config.toml`);
 }
-function prepareCodexLaunch(agentName, mcpUrl, extraArgs = [], codexHome = userCodexHome()) {
+function prepareCodexLaunch(agentName, mcpUrl, extraArgs = [], codexHome = userCodexHome(), cwd = process.cwd()) {
   mkdirSync2(codexHome, { recursive: true });
   const profilePath = codexProfilePath(agentName, codexHome);
-  writeFileSync3(profilePath, renderCodexProfile(mcpUrl), { mode: 384 });
+  writeFileSync3(profilePath, renderCodexProfile(mcpUrl, void 0, void 0, trustDirsFor(cwd)), { mode: 384 });
   const command = ["codex", "--profile", codexProfileName(agentName), ...extraArgs].join(" ");
   return { command, profilePath };
 }
@@ -1739,6 +1749,14 @@ function pruneCodexProfiles(liveAgentNames, codexHome = userCodexHome()) {
   }
   return removed;
 }
+function trustDirsFor(cwd) {
+  const dirs = [resolve2(cwd)];
+  try {
+    dirs.push(realpathSync2(cwd));
+  } catch {
+  }
+  return [...new Set(dirs)];
+}
 
 // src/cli/codex/run.ts
 function listCodexSessions() {
@@ -1763,9 +1781,9 @@ async function runCodex(options) {
     });
     process.stderr.write(`MCP server: ${setup2.mcpServer.url}
 `);
-    await new Promise((resolve3) => {
-      process.on("SIGINT", resolve3);
-      process.on("SIGTERM", resolve3);
+    await new Promise((resolve4) => {
+      process.on("SIGINT", resolve4);
+      process.on("SIGTERM", resolve4);
     });
     await setup2.cleanup();
     await eventLoopPromise2;
@@ -1867,9 +1885,9 @@ async function runCodex(options) {
     const noop = (() => true);
     process.stdout.write = noop;
     process.stderr.write = noop;
-    await new Promise((resolve3) => {
-      process.on("SIGTERM", resolve3);
-      process.on("SIGINT", resolve3);
+    await new Promise((resolve4) => {
+      process.on("SIGTERM", resolve4);
+      process.on("SIGINT", resolve4);
     });
     inviteAbort.abort();
     await invitePromise;
@@ -1949,12 +1967,12 @@ function stopCodexSession(session) {
 
 // src/cli/version.ts
 import { readFileSync as readFileSync4 } from "fs";
-import { dirname, resolve as resolve2 } from "path";
+import { dirname, resolve as resolve3 } from "path";
 import { fileURLToPath } from "url";
 function readPackageField(field) {
   try {
     const dir = dirname(fileURLToPath(import.meta.url));
-    const pkg = JSON.parse(readFileSync4(resolve2(dir, "../../package.json"), "utf-8"));
+    const pkg = JSON.parse(readFileSync4(resolve3(dir, "../../package.json"), "utf-8"));
     return typeof pkg[field] === "string" ? pkg[field] : null;
   } catch {
     return null;
@@ -2137,7 +2155,7 @@ async function main() {
     const all = rest.includes("--all");
     const positional = rest.find((a) => !a.startsWith("--"));
     const name = getFlag("name", rest) ?? positional;
-    const { roomStop } = await import("../room-IHVB5CWO.js");
+    const { roomStop } = await import("../room-ID4DQDPT.js");
     if (all) {
       for (const r of listRoomSessions()) {
         try {
@@ -2211,7 +2229,7 @@ async function main() {
     if (sub === "create") {
       const portStr = getFlag("port", roomArgs);
       const port = portStr ? parseInt(portStr, 10) : void 0;
-      const { roomCreate } = await import("../room-IHVB5CWO.js");
+      const { roomCreate } = await import("../room-ID4DQDPT.js");
       await roomCreate({
         room: getFlag("room", roomArgs) ?? roomArgs.find((a) => !a.startsWith("--")),
         port,
@@ -2228,12 +2246,12 @@ async function main() {
         console.error("Usage: apiary room resume <name>");
         process.exit(1);
       }
-      const { roomResume } = await import("../room-IHVB5CWO.js");
+      const { roomResume } = await import("../room-ID4DQDPT.js");
       await roomResume(name);
       return;
     }
     if (sub === "list" || sub === "ls") {
-      const { roomList } = await import("../room-IHVB5CWO.js");
+      const { roomList } = await import("../room-ID4DQDPT.js");
       roomList();
       return;
     }
@@ -2243,7 +2261,7 @@ async function main() {
         console.error("Usage: apiary room stop <name>");
         process.exit(1);
       }
-      const { roomStop } = await import("../room-IHVB5CWO.js");
+      const { roomStop } = await import("../room-ID4DQDPT.js");
       await roomStop(name);
       return;
     }
@@ -2258,7 +2276,7 @@ async function main() {
         console.error(`Invalid port: ${portStr}`);
         process.exit(1);
       }
-      const { spawnDaemonServer, isDaemonResult } = await import("../room-IHVB5CWO.js");
+      const { spawnDaemonServer, isDaemonResult } = await import("../room-ID4DQDPT.js");
       const daemonRes = await spawnDaemonServer({
         room: roomName,
         port,