zelari-code 2.43.0 → 2.44.0

package/dist/cli/main.bundled.js

@@ -38898,7 +38898,7 @@ var CORE_VERSION;
 var init_version = __esm({
   "packages/core/dist/version.js"() {
     "use strict";
-    CORE_VERSION = "2.43.0";
+    CORE_VERSION = "2.44.0";
   }
 });
 
@@ -55346,6 +55346,45 @@ var init_crossProviderFailover = __esm({
   }
 });
 
+// src/cli/serve/sessionControl.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+function runWithSession(sessionId2, fn) {
+  return dispatchContext.run({ sessionId: sessionId2, token: {} }, fn);
+}
+function getCurrentHarnessSessionId() {
+  return dispatchContext.getStore()?.sessionId;
+}
+function registerLiveTurnControl(control) {
+  const store6 = dispatchContext.getStore();
+  if (!store6) return void 0;
+  const registered = { ...control, token: store6.token };
+  liveTurns.set(store6.sessionId, registered);
+  return () => {
+    if (liveTurns.get(store6.sessionId) === registered) {
+      liveTurns.delete(store6.sessionId);
+    }
+  };
+}
+function getLiveTurnControl(sessionId2) {
+  return liveTurns.get(sessionId2);
+}
+function clearSessionTurnControl(sessionId2) {
+  const store6 = dispatchContext.getStore();
+  if (!store6 || store6.sessionId !== sessionId2) return;
+  const registered = liveTurns.get(sessionId2);
+  if (registered && registered.token === store6.token) {
+    liveTurns.delete(sessionId2);
+  }
+}
+var dispatchContext, liveTurns;
+var init_sessionControl = __esm({
+  "src/cli/serve/sessionControl.ts"() {
+    "use strict";
+    dispatchContext = new AsyncLocalStorage();
+    liveTurns = /* @__PURE__ */ new Map();
+  }
+});
+
 // src/cli/safety/toolPermissions.ts
 var toolPermissions_exports = {};
 __export(toolPermissions_exports, {
@@ -55362,27 +55401,42 @@ __export(toolPermissions_exports, {
   parsePermissionPreset: () => parsePermissionPreset,
   resolveToolPermission: () => resolveToolPermission
 });
-function grantSessionTool(toolName) {
+function grantsBucket(sessionId2) {
+  const key = sessionId2 && sessionId2.trim() ? sessionId2 : GLOBAL_BUCKET;
+  let bucket = grantsBySession.get(key);
+  if (!bucket) {
+    bucket = { tools: /* @__PURE__ */ new Set(), categories: /* @__PURE__ */ new Set() };
+    grantsBySession.set(key, bucket);
+  }
+  return bucket;
+}
+function grantSessionTool(toolName, sessionId2) {
   const n = toolName.trim();
-  if (n) sessionToolGrants.add(n);
+  if (n) grantsBucket(sessionId2).tools.add(n);
 }
-function grantSessionCategory(cat) {
-  sessionCategoryGrants.add(cat);
+function grantSessionCategory(cat, sessionId2) {
+  grantsBucket(sessionId2).categories.add(cat);
 }
-function clearSessionPermissionGrants() {
-  sessionToolGrants.clear();
-  sessionCategoryGrants.clear();
+function clearSessionPermissionGrants(sessionId2) {
+  if (sessionId2 === void 0) {
+    grantsBySession.clear();
+    return;
+  }
+  grantsBySession.delete(sessionId2 && sessionId2.trim() ? sessionId2 : GLOBAL_BUCKET);
 }
-function listSessionPermissionGrants() {
+function listSessionPermissionGrants(sessionId2) {
+  const bucket = grantsBucket(sessionId2);
   return {
-    tools: [...sessionToolGrants].sort(),
-    categories: [...sessionCategoryGrants]
+    tools: [...bucket.tools].sort(),
+    categories: [...bucket.categories]
   };
 }
-function isSessionGranted(toolName, required2) {
-  if (sessionToolGrants.has(toolName)) return true;
+function isSessionGranted(toolName, required2, sessionId2) {
+  const scope = sessionId2 ?? getCurrentHarnessSessionId();
+  const bucket = grantsBucket(scope);
+  if (bucket.tools.has(toolName)) return true;
   if (!required2.length) return false;
-  return required2.every((c) => sessionCategoryGrants.has(c));
+  return required2.every((c) => bucket.categories.has(c));
 }
 function parseAction(raw, fallback) {
   const v = raw?.trim().toLowerCase();
@@ -55464,12 +55518,13 @@ function resolveToolPermission(toolName, required2, policy) {
     categories: hit
   };
 }
-var sessionToolGrants, sessionCategoryGrants, PERMISSION_PRESETS, ACTION_RANK2;
+var GLOBAL_BUCKET, grantsBySession, PERMISSION_PRESETS, ACTION_RANK2;
 var init_toolPermissions = __esm({
   "src/cli/safety/toolPermissions.ts"() {
     "use strict";
-    sessionToolGrants = /* @__PURE__ */ new Set();
-    sessionCategoryGrants = /* @__PURE__ */ new Set();
+    init_sessionControl();
+    GLOBAL_BUCKET = "";
+    grantsBySession = /* @__PURE__ */ new Map();
     PERMISSION_PRESETS = {
       standard: { read: "allow", write: "allow", execute: "ask", network: "ask" },
       strict: { read: "allow", write: "ask", execute: "ask", network: "deny" },
@@ -69697,42 +69752,6 @@ var init_harnessStateEmit = __esm({
   }
 });
 
-// src/cli/serve/sessionControl.ts
-import { AsyncLocalStorage } from "node:async_hooks";
-function runWithSession(sessionId2, fn) {
-  return dispatchContext.run({ sessionId: sessionId2, token: {} }, fn);
-}
-function registerLiveTurnControl(control) {
-  const store6 = dispatchContext.getStore();
-  if (!store6) return void 0;
-  const registered = { ...control, token: store6.token };
-  liveTurns.set(store6.sessionId, registered);
-  return () => {
-    if (liveTurns.get(store6.sessionId) === registered) {
-      liveTurns.delete(store6.sessionId);
-    }
-  };
-}
-function getLiveTurnControl(sessionId2) {
-  return liveTurns.get(sessionId2);
-}
-function clearSessionTurnControl(sessionId2) {
-  const store6 = dispatchContext.getStore();
-  if (!store6 || store6.sessionId !== sessionId2) return;
-  const registered = liveTurns.get(sessionId2);
-  if (registered && registered.token === store6.token) {
-    liveTurns.delete(sessionId2);
-  }
-}
-var dispatchContext, liveTurns;
-var init_sessionControl = __esm({
-  "src/cli/serve/sessionControl.ts"() {
-    "use strict";
-    dispatchContext = new AsyncLocalStorage();
-    liveTurns = /* @__PURE__ */ new Map();
-  }
-});
-
 // src/cli/headless/controlReader.ts
 function parseControlEvent(raw) {
   if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
@@ -74705,6 +74724,7 @@ function createServePermissionBridge(write, timeoutMs2 = 12e4) {
         type: "permission.settled",
         requestId,
         decision,
+        ...entry.sessionId ? { sessionId: entry.sessionId } : {},
         ...timedOut ? { timedOut: true } : {}
       })
     );
@@ -74719,11 +74739,13 @@ function createServePermissionBridge(write, timeoutMs2 = 12e4) {
         const timer = setTimeout(() => {
           settle(requestId, "deny", true);
         }, timeoutMs2);
-        pending.set(requestId, { resolve: resolve10, timer, payload });
+        const sessionId2 = getCurrentHarnessSessionId();
+        pending.set(requestId, { resolve: resolve10, timer, payload, sessionId: sessionId2 });
         write(
           JSON.stringify({
             type: "permission.request",
             requestId,
+            ...sessionId2 ? { sessionId: sessionId2 } : {},
             tool: payload.tool,
             category: payload.category,
             categories,
@@ -74733,12 +74755,19 @@ function createServePermissionBridge(write, timeoutMs2 = 12e4) {
         );
       });
     },
-    respond: (requestId, decision) => settle(requestId, decision, false),
+    respond: (requestId, decision, scopeSessionId) => {
+      const entry = pending.get(requestId);
+      if (entry && scopeSessionId && entry.sessionId !== scopeSessionId) {
+        return false;
+      }
+      return settle(requestId, decision, false);
+    },
+    sessionOf: (requestId) => pending.get(requestId)?.sessionId,
     releaseGranted() {
       let n = 0;
       for (const [id3, entry] of [...pending]) {
         const cats = entry.payload.categories && entry.payload.categories.length > 0 ? entry.payload.categories : entry.payload.category ? entry.payload.category.split(",").map((c) => c.trim()).filter(Boolean) : [];
-        if (isSessionGranted(entry.payload.tool, cats)) {
+        if (isSessionGranted(entry.payload.tool, cats, entry.sessionId)) {
           if (settle(id3, "allow", false)) n += 1;
         }
       }
@@ -74751,7 +74780,7 @@ function servePermissionRespond(bridge, params) {
   if (!params || typeof params !== "object") {
     return { accepted: false, reason: "permission.respond requires an object params" };
   }
-  const { requestId, decision } = params;
+  const { requestId, decision, sessionId: sessionId2 } = params;
   if (typeof requestId !== "string" || requestId.length === 0) {
     return { accepted: false, reason: "permission.respond requires a non-empty string requestId" };
   }
@@ -74761,7 +74790,11 @@ function servePermissionRespond(bridge, params) {
       reason: "permission.respond decision must be 'allow' | 'deny' | 'always-tool' | 'always-category'"
     };
   }
-  return { accepted: bridge.respond(requestId, decision) };
+  const scope = typeof sessionId2 === "string" && sessionId2.length > 0 ? sessionId2 : void 0;
+  if (scope && bridge.sessionOf(requestId) !== scope) {
+    return { accepted: false, reason: "session_mismatch: requestId belongs to another session" };
+  }
+  return { accepted: bridge.respond(requestId, decision, scope) };
 }
 function asRegistryAskHandler(bridge) {
   return async (req) => {
@@ -74774,14 +74807,15 @@ function asRegistryAskHandler(bridge) {
       ...req.claims && req.claims.length > 0 ? { inputPreview: req.claims.map((c) => c.summary).join(" \xB7 ") } : {}
     });
     if (decision === "deny") return false;
+    const sessionId2 = getCurrentHarnessSessionId();
     if (decision === "always-tool") {
-      grantSessionTool(req.toolName);
+      grantSessionTool(req.toolName, sessionId2);
       bridge.releaseGranted();
     } else if (decision === "always-category") {
       for (const cat of req.categories) {
-        grantSessionCategory(cat);
+        grantSessionCategory(cat, sessionId2);
       }
-      grantSessionTool(req.toolName);
+      grantSessionTool(req.toolName, sessionId2);
       bridge.releaseGranted();
     }
     return true;
@@ -74792,6 +74826,7 @@ var init_permissionBridge = __esm({
   "src/cli/serve/permissionBridge.ts"() {
     "use strict";
     init_toolPermissions();
+    init_sessionControl();
     SERVE_PERMISSION_PRESETS = ["standard", "strict", "yolo"];
     PRESET_ENV = "ZELARI_PERMISSION_PRESET";
     PERMISSION_DECISIONS = [
@@ -74817,6 +74852,7 @@ function createServeAskUserBridge(write, timeoutMs2 = askUserTimeoutMs()) {
         type: "ask_user.settled",
         requestId,
         answer,
+        ...entry.sessionId ? { sessionId: entry.sessionId } : {},
         ...timedOut ? { timedOut: true } : {}
       })
     );
@@ -74833,11 +74869,13 @@ function createServeAskUserBridge(write, timeoutMs2 = askUserTimeoutMs()) {
         const timer = setTimeout(() => {
           settle(requestId, null, true);
         }, timeoutMs2);
-        pending.set(requestId, { resolve: resolve10, timer });
+        const sessionId2 = getCurrentHarnessSessionId();
+        pending.set(requestId, { resolve: resolve10, timer, sessionId: sessionId2 });
         write(
           JSON.stringify({
             type: "ask_user.request",
             requestId,
+            ...sessionId2 ? { sessionId: sessionId2 } : {},
             question,
             choices,
             ...req.context ? { context: req.context } : {}
@@ -74845,7 +74883,14 @@ function createServeAskUserBridge(write, timeoutMs2 = askUserTimeoutMs()) {
         );
       });
     },
-    respond: (requestId, answer) => settle(requestId, answer, false),
+    respond: (requestId, answer, scopeSessionId) => {
+      const entry = pending.get(requestId);
+      if (entry && scopeSessionId && entry.sessionId && entry.sessionId !== scopeSessionId) {
+        return false;
+      }
+      return settle(requestId, answer, false);
+    },
+    sessionOf: (requestId) => pending.get(requestId)?.sessionId,
     pendingCount: () => pending.size
   };
 }
@@ -74853,20 +74898,25 @@ function serveAskUserRespond(bridge, params) {
   if (!params || typeof params !== "object") {
     return { accepted: false, reason: "ask_user.respond requires an object params" };
   }
-  const { requestId, answer } = params;
+  const { requestId, answer, sessionId: sessionId2 } = params;
   if (typeof requestId !== "string" || requestId.length === 0) {
     return { accepted: false, reason: "ask_user.respond requires a non-empty string requestId" };
   }
   if (answer !== null && typeof answer !== "string") {
     return { accepted: false, reason: "ask_user.respond answer must be a string or null" };
   }
+  const scope = typeof sessionId2 === "string" && sessionId2.length > 0 ? sessionId2 : void 0;
+  if (scope && bridge.sessionOf(requestId) && bridge.sessionOf(requestId) !== scope) {
+    return { accepted: false, reason: "session_mismatch: requestId belongs to another session" };
+  }
   const text = typeof answer === "string" ? answer.trim() : null;
-  return { accepted: bridge.respond(requestId, text && text.length > 0 ? text : null) };
+  return { accepted: bridge.respond(requestId, text && text.length > 0 ? text : null, scope) };
 }
 var init_askUserBridge = __esm({
   "src/cli/serve/askUserBridge.ts"() {
     "use strict";
     init_askUserTimeout();
+    init_sessionControl();
   }
 });
 
@@ -75030,17 +75080,23 @@ function createCliRunTurn(onPermissionAsk, onAskUser) {
     const opts = bindHarnessTurnOptions(input, deps.session.workspaceRoot);
     if (onPermissionAsk) opts.onPermissionAsk = onPermissionAsk;
     if (onAskUser) opts.onAskUser = onAskUser;
+    const priorPreset = process.env[PRESET_ENV2];
     applyTurnPermissionPreset(input);
-    const lspProvider = resolveTurnLspProvider(deps.services);
-    const exitCode = await dispatchHeadlessTurn(
-      opts,
-      provider,
-      model,
-      stream,
-      void 0,
-      lspProvider ? { lspProvider } : void 0
-    );
-    return { exitCode };
+    try {
+      const lspProvider = resolveTurnLspProvider(deps.services);
+      const exitCode = await dispatchHeadlessTurn(
+        opts,
+        provider,
+        model,
+        stream,
+        void 0,
+        lspProvider ? { lspProvider } : void 0
+      );
+      return { exitCode };
+    } finally {
+      if (priorPreset === void 0) delete process.env[PRESET_ENV2];
+      else process.env[PRESET_ENV2] = priorPreset;
+    }
   };
 }
 function unknownSessionEnvelope(id3, rawSessionId) {
@@ -75121,6 +75177,7 @@ function startHarnessServer(options = {}) {
           return { id: req.id ?? null, ok: false, error: { code: "unknown_session", message: `no session '${String(params.sessionId ?? "")}'` } };
         }
         await session.dispose();
+        clearSessionPermissionGrants(session.id);
         return { id: req.id ?? null, ok: true, result: { disposed: true } };
       }
       // t32: session-scoped steer/cancel over the SAME protocol v2 — no new
@@ -75236,6 +75293,7 @@ async function runHarnessServer() {
     process.once("SIGTERM", finish2);
   });
 }
+var PRESET_ENV2;
 var init_harnessServer = __esm({
   "src/cli/serve/harnessServer.ts"() {
     "use strict";
@@ -75251,8 +75309,10 @@ var init_harnessServer = __esm({
     init_policyGate();
     init_policyLoadMode();
     init_permissionBridge();
+    init_toolPermissions();
     init_askUserBridge();
     init_spineLockSweep();
+    PRESET_ENV2 = "ZELARI_PERMISSION_PRESET";
   }
 });