@openma/cli 0.6.1 → 0.6.3

package/dist/index.js

@@ -4797,7 +4797,7 @@ var init_probe = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/key.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/key.js
 function isKeybinding(value) {
   return keybindingLookup.has(value);
 }
@@ -4809,7 +4809,7 @@ function getDefaultKeybindings() {
 }
 var keybindings, keybindingLookup, isUpKey, isDownKey, isSpaceKey, isNumberKey, isEnterKey;
 var init_key = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/key.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/key.js"() {
     keybindings = ["emacs", "vim"];
     keybindingLookup = new Set(keybindings);
     isUpKey = (key, keybindings2 = []) => (
@@ -4830,10 +4830,10 @@ var init_key = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/errors.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/errors.js
 var AbortPromptError, CancelPromptError, ExitPromptError, HookError, ValidationError;
 var init_errors = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/errors.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/errors.js"() {
     AbortPromptError = class extends Error {
       name = "AbortPromptError";
       message = "Prompt was aborted";
@@ -4858,7 +4858,7 @@ var init_errors = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/hook-engine.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/hook-engine.js
 import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
 function createStore(rl) {
   const store = {
@@ -4933,7 +4933,7 @@ function handleChange() {
 }
 var hookStorage, effectScheduler;
 var init_hook_engine = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/hook-engine.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/hook-engine.js"() {
     init_errors();
     hookStorage = new AsyncLocalStorage();
     effectScheduler = {
@@ -4970,7 +4970,7 @@ var init_hook_engine = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/use-state.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/use-state.js
 import { AsyncResource as AsyncResource2 } from "node:async_hooks";
 function isFactory(value) {
   return typeof value === "function";
@@ -4992,12 +4992,12 @@ function useState(defaultValue) {
   });
 }
 var init_use_state = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/use-state.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/use-state.js"() {
     init_hook_engine();
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/use-effect.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/use-effect.js
 function useEffect(cb, depArray) {
   withPointer((pointer) => {
     const oldDeps = pointer.get();
@@ -5009,7 +5009,7 @@ function useEffect(cb, depArray) {
   });
 }
 var init_use_effect = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/use-effect.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/use-effect.js"() {
     init_hook_engine();
   }
 });
@@ -5312,7 +5312,7 @@ var init_dist = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/theme.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/theme.js
 import { styleText } from "node:util";
 function getDefaultTheme() {
   return {
@@ -5322,7 +5322,7 @@ function getDefaultTheme() {
 }
 var defaultTheme;
 var init_theme = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/theme.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/theme.js"() {
     init_dist();
     init_key();
     defaultTheme = {
@@ -5348,7 +5348,7 @@ var init_theme = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/make-theme.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/make-theme.js
 function isPlainObject(value) {
   if (typeof value !== "object" || value === null)
     return false;
@@ -5376,12 +5376,12 @@ function makeTheme(...themes) {
   return deepMerge(...themesToMerge);
 }
 var init_make_theme = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/make-theme.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/make-theme.js"() {
     init_theme();
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/use-prefix.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/use-prefix.js
 function usePrefix({ status = "idle", theme }) {
   const [showLoader, setShowLoader] = useState(false);
   const [tick, setTick] = useState(0);
@@ -5412,14 +5412,14 @@ function usePrefix({ status = "idle", theme }) {
   return typeof prefix === "string" ? prefix : prefix[iconName] ?? prefix["idle"];
 }
 var init_use_prefix = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/use-prefix.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/use-prefix.js"() {
     init_use_state();
     init_use_effect();
     init_make_theme();
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/use-memo.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/use-memo.js
 function useMemo(fn, dependencies) {
   return withPointer((pointer) => {
     const prev = pointer.get();
@@ -5432,22 +5432,22 @@ function useMemo(fn, dependencies) {
   });
 }
 var init_use_memo = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/use-memo.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/use-memo.js"() {
     init_hook_engine();
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/use-ref.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/use-ref.js
 function useRef(val) {
   return useState({ current: val })[0];
 }
 var init_use_ref = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/use-ref.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/use-ref.js"() {
     init_use_state();
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/use-keypress.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/use-keypress.js
 function useKeypress(userHandler) {
   const signal = useRef(userHandler);
   signal.current = userHandler;
@@ -5466,7 +5466,7 @@ function useKeypress(userHandler) {
   }, []);
 }
 var init_use_keypress = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/use-keypress.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/use-keypress.js"() {
     init_use_ref();
     init_use_effect();
     init_hook_engine();
@@ -5875,7 +5875,7 @@ var init_main = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/utils.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/utils.js
 function breakLines(content, width) {
   return content.split("\n").flatMap((line) => wrapAnsi(line, width, { trim: false, wordWrap: false }).split("\n").map((str) => str.trimEnd())).join("\n");
 }
@@ -5884,14 +5884,14 @@ function readlineWidth() {
 }
 var import_cli_width;
 var init_utils2 = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/utils.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/utils.js"() {
     import_cli_width = __toESM(require_cli_width(), 1);
     init_main();
     init_hook_engine();
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/pagination/use-pagination.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/pagination/use-pagination.js
 function usePointerPosition({ active, renderedItems, pageSize, loop }) {
   const state = useRef({
     lastPointer: active,
@@ -5980,7 +5980,7 @@ function usePagination({ items, active, renderItem, pageSize, loop = true }) {
   return pageBuffer.filter((line) => typeof line === "string").join("\n");
 }
 var init_use_pagination = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/pagination/use-pagination.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/pagination/use-pagination.js"() {
     init_use_ref();
     init_utils2();
   }
@@ -6397,11 +6397,11 @@ var init_dist4 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/screen-manager.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/screen-manager.js
 import { stripVTControlCharacters } from "node:util";
 var height, lastLine, ScreenManager;
 var init_screen_manager = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/screen-manager.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/screen-manager.js"() {
     init_utils2();
     init_dist4();
     height = (content) => content.split("\n").length;
@@ -6466,10 +6466,10 @@ var init_screen_manager = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/promise-polyfill.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/promise-polyfill.js
 var PromisePolyfill;
 var init_promise_polyfill = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/promise-polyfill.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/promise-polyfill.js"() {
     PromisePolyfill = class extends Promise {
       // Available starting from Node 22
       // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/withResolvers
@@ -6486,7 +6486,7 @@ var init_promise_polyfill = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/create-prompt.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/create-prompt.js
 import * as readline2 from "node:readline";
 import { AsyncResource as AsyncResource3 } from "node:async_hooks";
 import path from "node:path";
@@ -6600,7 +6600,7 @@ function createPrompt(view) {
 }
 var import_mute_stream, nativeSetImmediate;
 var init_create_prompt = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/create-prompt.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/create-prompt.js"() {
     import_mute_stream = __toESM(require_lib(), 1);
     init_mjs();
     init_screen_manager();
@@ -6611,11 +6611,11 @@ var init_create_prompt = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/Separator.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/Separator.js
 import { styleText as styleText2 } from "node:util";
 var Separator;
 var init_Separator = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/lib/Separator.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/lib/Separator.js"() {
     init_dist();
     Separator = class {
       separator = styleText2("dim", Array.from({ length: 15 }).join(dist_default.line));
@@ -6632,9 +6632,9 @@ var init_Separator = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/index.js
+// ../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/index.js
 var init_dist5 = __esm({
-  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.5.1/node_modules/@inquirer/core/dist/index.js"() {
+  "../../node_modules/.pnpm/@inquirer+core@11.2.1_@types+node@26.6.3/node_modules/@inquirer/core/dist/index.js"() {
     init_key();
     init_errors();
     init_use_prefix();
@@ -6648,7 +6648,7 @@ var init_dist5 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@inquirer+checkbox@5.2.1_@types+node@26.5.1/node_modules/@inquirer/checkbox/dist/index.js
+// ../../node_modules/.pnpm/@inquirer+checkbox@5.2.1_@types+node@26.6.3/node_modules/@inquirer/checkbox/dist/index.js
 import { styleText as styleText3 } from "node:util";
 function isSelectable(item) {
   return !Separator.isSeparator(item) && !item.disabled;
@@ -6699,7 +6699,7 @@ function normalizeChoices(choices) {
 }
 var checkboxTheme, dist_default4;
 var init_dist6 = __esm({
-  "../../node_modules/.pnpm/@inquirer+checkbox@5.2.1_@types+node@26.5.1/node_modules/@inquirer/checkbox/dist/index.js"() {
+  "../../node_modules/.pnpm/@inquirer+checkbox@5.2.1_@types+node@26.6.3/node_modules/@inquirer/checkbox/dist/index.js"() {
     init_dist5();
     init_dist4();
     init_dist();
@@ -25642,11 +25642,30 @@ function dirNameFor(sessionId) {
   if (/^[a-f0-9]{1,12}$/i.test(sessionId)) return sessionId.toLowerCase();
   return createHash("sha256").update(sessionId).digest("hex").slice(0, DIR_NAME_LEN);
 }
+function sessionScratchDirPath(sessionId) {
+  return join5(paths().sessionsDir, dirNameFor(sessionId));
+}
 async function ensureSessionCwd(sessionId) {
-  const cwd = join5(paths().sessionsDir, dirNameFor(sessionId));
+  const cwd = sessionScratchDirPath(sessionId);
   await mkdir6(cwd, { recursive: true });
   return cwd;
 }
+function acpProcessCwd(scratchDir, requestedCwd) {
+  const requested = requestedCwd?.trim();
+  return requested ? requested : scratchDir;
+}
+function acpSessionReadyOut(params) {
+  const base = {
+    type: "session.ready",
+    session_id: params.session_id,
+    tenant_id: params.tenant_id,
+    acp_session_id: params.acp_session_id
+  };
+  if (params.freshSpawn && params.scratchDir) {
+    return { ...base, bundle_dir: params.scratchDir, fresh: true };
+  }
+  return base;
+}
 async function writeBundle(cwd, files) {
   for (const f of files) {
     if (f.path.startsWith("/") || f.path.includes("..")) continue;
@@ -25777,6 +25796,8 @@ var init_session_manager = __esm({
        *  doesn't hit "session not ready" mid-stream just because the daemon
        *  is on its way out. */
       #draining = false;
+      /** Sessions awaiting their first session.ready on the managed runtime path. */
+      #freshSpawnPending = /* @__PURE__ */ new Set();
       constructor(send, runtimeDependencies) {
         this.#send = send;
         if (runtimeDependencies) {
@@ -25809,11 +25830,25 @@ var init_session_manager = __esm({
       }
       #publishManagedRuntimeEvent(event) {
         const scope = this.#runtimeScopes.get(event.sessionId);
-        this.#send(encodeSessionHostEvent(event, {
-          tenantId: scope?.id
-        }));
+        if (event.type === "session.ready" && this.#freshSpawnPending.delete(event.sessionId)) {
+          this.#send(acpSessionReadyOut({
+            session_id: event.sessionId,
+            tenant_id: scope?.id ?? "",
+            acp_session_id: event.acpSessionId,
+            scratchDir: sessionScratchDirPath(event.sessionId),
+            freshSpawn: true
+          }));
+        } else {
+          this.#send(encodeSessionHostEvent(event, {
+            tenantId: scope?.id
+          }));
+        }
         if (event.type === "session.disposed") {
           this.#runtimeScopes.delete(event.sessionId);
+          this.#freshSpawnPending.delete(event.sessionId);
+        }
+        if (event.type === "session.error") {
+          this.#freshSpawnPending.delete(event.sessionId);
         }
       }
       setSpawnEnv(env) {
@@ -25863,7 +25898,11 @@ var init_session_manager = __esm({
           return;
         }
         for (const [session_id, sess] of this.#sessions) {
-          this.#send({ type: "session.ready", session_id, tenant_id: sess.tenantId, acp_session_id: sess.acpSessionId });
+          this.#send(acpSessionReadyOut({
+            session_id,
+            tenant_id: sess.tenantId,
+            acp_session_id: sess.acpSessionId
+          }));
         }
       }
       async start(p) {
@@ -25908,6 +25947,7 @@ var init_session_manager = __esm({
               id: tenantId,
               agentApiKey: tenantKey
             });
+            this.#freshSpawnPending.add(p.session_id);
           }
           await this.#managedRuntime.dispatch({
             type: "session.start",
@@ -25921,12 +25961,11 @@ var init_session_manager = __esm({
         }
         const existing = this.#sessions.get(p.session_id);
         if (existing) {
-          this.#send({
-            type: "session.ready",
+          this.#send(acpSessionReadyOut({
             session_id: p.session_id,
             tenant_id: existing.tenantId,
             acp_session_id: existing.acpSessionId
-          });
+          }));
           return;
         }
         const agent = resolveKnownAgent(p.agent_id);
@@ -25958,14 +25997,15 @@ var init_session_manager = __esm({
           });
           return;
         }
-        const sessionCwd = await ensureSessionCwd(p.session_id);
+        const scratchDir = await ensureSessionCwd(p.session_id);
+        const processCwd = acpProcessCwd(scratchDir, p.cwd);
         let blocklist = [];
         let bundleMcpServers = [];
         let bundleEnv = [];
         try {
           const bundle = await this.#fetchBundle(p.session_id, agent.id);
           if (bundle) {
-            await writeBundle(sessionCwd, bundle.files);
+            await writeBundle(scratchDir, bundle.files);
             blocklist = bundle.local_skill_blocklist ?? [];
             bundleMcpServers = bundle.mcp_servers ?? [];
             bundleEnv = bundle.env ?? [];
@@ -25977,7 +26017,7 @@ var init_session_manager = __esm({
         const extraEnv = {};
         if (agent.id === "claude-acp") {
           try {
-            const cfgDir = await setupClaudeConfigDir(sessionCwd, new Set(blocklist));
+            const cfgDir = await setupClaudeConfigDir(scratchDir, new Set(blocklist));
             extraEnv.CLAUDE_CONFIG_DIR = cfgDir;
           } catch (e) {
             process.stderr.write(
@@ -25995,7 +26035,7 @@ var init_session_manager = __esm({
           headers: tenantKey ? [{ name: "Authorization", value: `Bearer ${tenantKey}` }] : []
         }));
         process.stderr.write(
-          `  \u2192 SessionManager.start ${agent.spec.command} cwd=${sessionCwd}` + (extraEnv.CLAUDE_CONFIG_DIR ? ` cfg=${extraEnv.CLAUDE_CONFIG_DIR}` : "") + (blocklist.length ? ` blocklist=${blocklist.length}` : "") + (mcpServersForAcp.length ? ` mcp=${mcpServersForAcp.length}` : "") + (bundleEnv.length ? ` env=${bundleEnv.length}` : "") + // Intentionally NOT logging env names or values — these come from
+          `  \u2192 SessionManager.start ${agent.spec.command} cwd=${processCwd}` + (processCwd === scratchDir ? "" : ` scratch=${scratchDir}`) + (extraEnv.CLAUDE_CONFIG_DIR ? ` cfg=${extraEnv.CLAUDE_CONFIG_DIR}` : "") + (blocklist.length ? ` blocklist=${blocklist.length}` : "") + (mcpServersForAcp.length ? ` mcp=${mcpServersForAcp.length}` : "") + (bundleEnv.length ? ` env=${bundleEnv.length}` : "") + // Intentionally NOT logging env names or values — these come from
           // user-supplied session resources and may be sensitive even if not
           // formally encrypted. Only the count is observable.
           "\n"
@@ -26004,7 +26044,7 @@ var init_session_manager = __esm({
           const session = await this.#runtime.start({
             agent: {
               ...agent.spec,
-              cwd: sessionCwd,
+              cwd: processCwd,
               env: scrubAcpSpawnEnv({ ...agent.spec.env ?? {}, ...envFromBundle, ...extraEnv })
             },
             mcpServers: mcpServersForAcp,
@@ -26016,12 +26056,13 @@ var init_session_manager = __esm({
             tenantId,
             turns: /* @__PURE__ */ new Map()
           });
-          this.#send({
-            type: "session.ready",
+          this.#send(acpSessionReadyOut({
             session_id: p.session_id,
             tenant_id: tenantId,
-            acp_session_id: session.acpSessionId
-          });
+            acp_session_id: session.acpSessionId,
+            scratchDir,
+            freshSpawn: true
+          }));
         } catch (e) {
           this.#send({
             type: "session.error",
@@ -26265,7 +26306,8 @@ async function prepareNodeSession(input) {
       `binary not on PATH for ${agent.id}: \`${agent.spec.command}\`` + (agent.installHint ? `. Install: ${agent.installHint}` : "")
     );
   }
-  const sessionCwd = await ensureSessionCwd(input.command.sessionId);
+  const scratchDir = await ensureSessionCwd(input.command.sessionId);
+  const processCwd = acpProcessCwd(scratchDir, input.command.cwd);
   let blocklist = [];
   let bundleMcpServers = [];
   let bundleEnv = [];
@@ -26276,7 +26318,7 @@ async function prepareNodeSession(input) {
       agent.id
     );
     if (bundle) {
-      await writeBundle(sessionCwd, bundle.files);
+      await writeBundle(scratchDir, bundle.files);
       blocklist = bundle.local_skill_blocklist ?? [];
       bundleMcpServers = bundle.mcp_servers ?? [];
       bundleEnv = bundle.env ?? [];
@@ -26291,7 +26333,7 @@ async function prepareNodeSession(input) {
   if (agent.id === "claude-acp") {
     try {
       extraEnv.CLAUDE_CONFIG_DIR = await setupClaudeConfigDir(
-        sessionCwd,
+        scratchDir,
         new Set(blocklist)
       );
     } catch (error40) {
@@ -26315,12 +26357,12 @@ async function prepareNodeSession(input) {
     }]
   }));
   process.stderr.write(
-    `  \u2192 SessionManager.start ${agent.spec.command} cwd=${sessionCwd}` + (extraEnv.CLAUDE_CONFIG_DIR ? ` cfg=${extraEnv.CLAUDE_CONFIG_DIR}` : "") + (blocklist.length ? ` blocklist=${blocklist.length}` : "") + (mcpServers.length ? ` mcp=${mcpServers.length}` : "") + (bundleEnv.length ? ` env=${bundleEnv.length}` : "") + "\n"
+    `  \u2192 SessionManager.start ${agent.spec.command} cwd=${processCwd}` + (processCwd === scratchDir ? "" : ` scratch=${scratchDir}`) + (extraEnv.CLAUDE_CONFIG_DIR ? ` cfg=${extraEnv.CLAUDE_CONFIG_DIR}` : "") + (blocklist.length ? ` blocklist=${blocklist.length}` : "") + (mcpServers.length ? ` mcp=${mcpServers.length}` : "") + (bundleEnv.length ? ` env=${bundleEnv.length}` : "") + "\n"
   );
   return {
     agent: {
       ...agent.spec,
-      cwd: sessionCwd,
+      cwd: processCwd,
       env: scrubAcpSpawnEnv2({
         ...agent.spec.env ?? {},
         ...envFromBundle,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openma/cli",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "CLI for the openma managed agents platform",
   "type": "module",
   "bin": {
@@ -37,16 +37,16 @@
   "devDependencies": {
     "@inquirer/checkbox": "^5.2.1",
     "@openma/common": "git+https://github.com/openma-ai/openma-common.git#e196bdcac3d5f3165d6833c2531d4255a51620e9",
-    "@types/node": "^26.5.1",
+    "@types/node": "^26.6.3",
     "@types/ws": "^8.5.0",
     "esbuild": "^0.25.0",
     "tsx": "^4.19.0",
     "typescript": "^7.0.2",
     "vitest": "^4.1.3",
     "ws": "^8.18.0",
-    "@open-managed-agents/acp-runtime": "0.0.0",
     "@open-managed-agents/api-types": "0.1.0",
-    "@open-managed-agents/runtime": "0.1.0"
+    "@open-managed-agents/runtime": "0.1.0",
+    "@open-managed-agents/acp-runtime": "0.0.0"
   },
   "scripts": {
     "build": "esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js --banner:js=\"#!/usr/bin/env node\nimport { createRequire as __cr } from 'node:module'; const require = __cr(import.meta.url);\"",