switchroom 0.18.12 → 0.18.13

package/dist/agent-scheduler/index.js

@@ -13120,6 +13120,13 @@ var ApprovalLookupRequestSchema = exports_external.object({
   action: exports_external.string().min(1),
   current_approver_set: exports_external.array(exports_external.string())
 });
+var ApprovalLookupByRequestRequestSchema = exports_external.object({
+  v: exports_external.literal(1),
+  op: exports_external.literal("approval_lookup_by_request"),
+  agent_unit: exports_external.string().min(1),
+  request_id: exports_external.string().regex(/^[0-9a-f]{32}$/),
+  current_approver_set: exports_external.array(exports_external.string())
+});
 var ApprovalConsumeRequestSchema = exports_external.object({
   v: exports_external.literal(1),
   op: exports_external.literal("approval_consume"),
@@ -13174,6 +13181,7 @@ var RequestSchema = exports_external.discriminatedUnion("op", [
   RevokeGrantRequestSchema,
   ApprovalRequestRequestSchema,
   ApprovalLookupRequestSchema,
+  ApprovalLookupByRequestRequestSchema,
   ApprovalConsumeRequestSchema,
   ApprovalRevokeRequestSchema,
   ApprovalListRequestSchema,

package/dist/auth-broker/index.js

@@ -7010,6 +7010,41 @@ var require_dist = __commonJS((exports) => {
   exports.visitAsync = visit.visitAsync;
 });
 
+// src/util/atomic.ts
+import { randomBytes } from "node:crypto";
+import { closeSync, constants, fsyncSync, openSync, renameSync, rmSync, writeSync } from "node:fs";
+function atomicWriteFileSync(destPath, contents, mode = 384) {
+  const tmp = `${destPath}.tmp-${process.pid}-${randomBytes(4).toString("hex")}`;
+  const buf = typeof contents === "string" ? Buffer.from(contents, "utf-8") : contents;
+  let fd = null;
+  try {
+    fd = openSync(tmp, TMP_OPEN_FLAGS, mode);
+    writeSync(fd, buf, 0, buf.length, 0);
+    fsyncSync(fd);
+    closeSync(fd);
+    fd = null;
+    renameSync(tmp, destPath);
+  } catch (err) {
+    if (fd !== null) {
+      try {
+        closeSync(fd);
+      } catch {}
+    }
+    try {
+      rmSync(tmp, { force: true });
+    } catch {}
+    throw err;
+  }
+}
+function atomicWriteJsonSync(destPath, value, mode = 384) {
+  atomicWriteFileSync(destPath, JSON.stringify(value, null, 2) + `
+`, mode);
+}
+var TMP_OPEN_FLAGS;
+var init_atomic = __esm(() => {
+  TMP_OPEN_FLAGS = constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | (constants.O_NOFOLLOW ?? 0);
+});
+
 // node_modules/.bun/handlebars@4.7.9/node_modules/handlebars/dist/cjs/handlebars/utils.js
 var require_utils = __commonJS((exports) => {
   exports.__esModule = true;
@@ -12570,41 +12605,6 @@ var require_lib = __commonJS((exports, module) => {
   }
 });
 
-// src/util/atomic.ts
-import { randomBytes } from "node:crypto";
-import { closeSync, constants, fsyncSync, openSync, renameSync, rmSync, writeSync } from "node:fs";
-function atomicWriteFileSync(destPath, contents, mode = 384) {
-  const tmp = `${destPath}.tmp-${process.pid}-${randomBytes(4).toString("hex")}`;
-  const buf = typeof contents === "string" ? Buffer.from(contents, "utf-8") : contents;
-  let fd = null;
-  try {
-    fd = openSync(tmp, TMP_OPEN_FLAGS, mode);
-    writeSync(fd, buf, 0, buf.length, 0);
-    fsyncSync(fd);
-    closeSync(fd);
-    fd = null;
-    renameSync(tmp, destPath);
-  } catch (err) {
-    if (fd !== null) {
-      try {
-        closeSync(fd);
-      } catch {}
-    }
-    try {
-      rmSync(tmp, { force: true });
-    } catch {}
-    throw err;
-  }
-}
-function atomicWriteJsonSync(destPath, value, mode = 384) {
-  atomicWriteFileSync(destPath, JSON.stringify(value, null, 2) + `
-`, mode);
-}
-var TMP_OPEN_FLAGS;
-var init_atomic = __esm(() => {
-  TMP_OPEN_FLAGS = constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | (constants.O_NOFOLLOW ?? 0);
-});
-
 // src/auth/broker/index.ts
 import { existsSync as existsSync9, readFileSync as readFileSync8 } from "node:fs";
 
@@ -18112,7 +18112,7 @@ import {
   rmSync as rmSync5,
   statSync as statSync6,
   unlinkSync,
-  writeFileSync as writeFileSync3
+  writeFileSync as writeFileSync2
 } from "node:fs";
 import { closeSync as closeSync2, openSync as openSync2, writeSync as writeSync2 } from "node:fs";
 import * as constants2 from "node:constants";
@@ -18124,6 +18124,7 @@ import { createHash } from "node:crypto";
 
 // src/agents/scaffold.ts
 import { join as join4, resolve as resolve5 } from "node:path";
+init_atomic();
 
 // src/config/timezone.ts
 var CONTAINER_DEFAULT_UTC_ZONES = new Set([
@@ -18390,6 +18391,13 @@ var ApprovalLookupRequestSchema = exports_external.object({
   action: exports_external.string().min(1),
   current_approver_set: exports_external.array(exports_external.string())
 });
+var ApprovalLookupByRequestRequestSchema = exports_external.object({
+  v: exports_external.literal(1),
+  op: exports_external.literal("approval_lookup_by_request"),
+  agent_unit: exports_external.string().min(1),
+  request_id: exports_external.string().regex(/^[0-9a-f]{32}$/),
+  current_approver_set: exports_external.array(exports_external.string())
+});
 var ApprovalConsumeRequestSchema = exports_external.object({
   v: exports_external.literal(1),
   op: exports_external.literal("approval_consume"),
@@ -18444,6 +18452,7 @@ var RequestSchema = exports_external.discriminatedUnion("op", [
   RevokeGrantRequestSchema,
   ApprovalRequestRequestSchema,
   ApprovalLookupRequestSchema,
+  ApprovalLookupByRequestRequestSchema,
   ApprovalConsumeRequestSchema,
   ApprovalRevokeRequestSchema,
   ApprovalListRequestSchema,
@@ -18643,9 +18652,6 @@ var BIND_MOUNT_EXACT_SOURCE_DENY = new Set(["/var/run/docker.sock"]);
 var OAUTH_BETA = "oauth-2025-04-20";
 var DEFAULT_USER_AGENT = "claude-cli/1.0.0 (external, cli)";
 var DEFAULT_PROBE_MODEL = "claude-haiku-4-5-20251001";
-function isProbeThin(q) {
-  return q.fiveHourUtilPresent === false && q.sevenDayUtilPresent === false;
-}
 function parseFloatHeader(headers, name) {
   const v = headers.get(name);
   if (v == null || v.trim().length === 0)
@@ -18742,6 +18748,9 @@ function snapshotFresh(s, now, maxAgeMs = SNAPSHOT_STALE_AGE_MS) {
 function snapshotWalled(s) {
   return s.fiveHourUtilizationPct >= WALL_PCT || s.sevenDayUtilizationPct >= WALL_PCT;
 }
+function snapshotComplete(s) {
+  return s.fiveHourUtilPresent !== false && s.sevenDayUtilPresent !== false;
+}
 function overageLiftsWall(snapshot, inAllowList) {
   if (!inAllowList)
     return false;
@@ -18757,16 +18766,19 @@ function snapshotClearlyHealthy(s) {
 }
 function accountEligibility(opts) {
   const { mark, snapshot, now, allowOverage = false } = opts;
+  if (snapshotFresh(snapshot, now) && snapshotWalled(snapshot) && !overageLiftsWall(snapshot, allowOverage)) {
+    return "blocked";
+  }
   if (snapshotFresh(snapshot, now)) {
     const markedAt = mark?.marked_at ?? 0;
     if (snapshot.capturedAt >= markedAt) {
       if (snapshotWalled(snapshot)) {
-        if (overageLiftsWall(snapshot, allowOverage)) {
+        if (overageLiftsWall(snapshot, allowOverage))
           return "eligible";
-        }
         return "blocked";
       }
-      return "eligible";
+      if (snapshotComplete(snapshot))
+        return "eligible";
     }
   }
   if (mark !== undefined && mark.exhausted_until > now)
@@ -18783,7 +18795,7 @@ function snapshotShouldClearMark(snapshot, mark, now) {
     return false;
   if (snapshot.capturedAt < (mark.marked_at ?? 0))
     return false;
-  if (isProbeThin(snapshot))
+  if (!snapshotComplete(snapshot))
     return false;
   return snapshotClearlyHealthy(snapshot);
 }
@@ -18792,7 +18804,7 @@ function clampMarkExpiry(opts) {
   const shortCeil = now + shortMs;
   if (proposedUntil <= shortCeil)
     return proposedUntil;
-  const liveContradictsWeeklyWall = snapshotFresh(snapshot, now) && snapshot.sevenDayUtilizationPct < WALL_PCT;
+  const liveContradictsWeeklyWall = snapshotFresh(snapshot, now) && snapshot.sevenDayUtilPresent !== false && snapshot.sevenDayUtilizationPct < WALL_PCT;
   return liveContradictsWeeklyWall ? shortCeil : proposedUntil;
 }
 var SOFT_AVOID_FIVE_HOUR_CAP = 98;
@@ -18885,6 +18897,7 @@ function resolveConsumerProbeIntervalMs(env) {
 init_atomic();
 
 // src/auth/account-store.ts
+init_atomic();
 import {
   chownSync,
   existsSync as existsSync5,
@@ -18893,10 +18906,8 @@ import {
   readdirSync as readdirSync3,
   renameSync as renameSync2,
   rmSync as rmSync2,
-  statSync as statSync3,
-  writeFileSync as writeFileSync2
+  statSync as statSync3
 } from "node:fs";
-import { randomBytes as randomBytes2 } from "node:crypto";
 import { homedir as homedir4 } from "node:os";
 import { join as join5, resolve as resolve6 } from "node:path";
 var LABEL_MAX = 64;
@@ -18980,8 +18991,8 @@ function enrichClaudeCreds(value) {
 }
 function writeAccountCredentials(label, value, home2 = homedir4()) {
   validateAccountLabel(label);
-  mkdirSync2(accountDir(label, home2), { recursive: true });
-  atomicWriteJson(accountCredentialsPath(label, home2), enrichClaudeCreds(value));
+  mkdirSync2(accountDir(label, home2), { recursive: true, mode: 448 });
+  atomicWriteJsonSync(accountCredentialsPath(label, home2), enrichClaudeCreds(value));
 }
 function chownAccountFiles(label, uid, home2 = homedir4()) {
   validateAccountLabel(label);
@@ -19007,8 +19018,8 @@ function readAccountMeta(label, home2 = homedir4()) {
 }
 function writeAccountMeta(label, value, home2 = homedir4()) {
   validateAccountLabel(label);
-  mkdirSync2(accountDir(label, home2), { recursive: true });
-  atomicWriteJson(accountMetaPath(label, home2), value);
+  mkdirSync2(accountDir(label, home2), { recursive: true, mode: 448 });
+  atomicWriteJsonSync(accountMetaPath(label, home2), value);
 }
 function patchAccountMeta(label, patch, home2 = homedir4()) {
   const existing = readAccountMeta(label, home2) ?? { createdAt: Date.now() };
@@ -19016,19 +19027,6 @@ function patchAccountMeta(label, patch, home2 = homedir4()) {
   writeAccountMeta(label, merged, home2);
   return merged;
 }
-function atomicWriteJson(destPath, value, mode = 384) {
-  const tmp = `${destPath}.tmp-${process.pid}-${randomBytes2(4).toString("hex")}`;
-  try {
-    writeFileSync2(tmp, JSON.stringify(value, null, 2) + `
-`, { mode });
-    renameSync2(tmp, destPath);
-  } catch (err) {
-    try {
-      rmSync2(tmp, { force: true });
-    } catch {}
-    throw err;
-  }
-}
 
 // src/auth/account-refresh.ts
 var REFRESH_THRESHOLD_MS = 60 * 60 * 1000;
@@ -20195,7 +20193,7 @@ class AuthBroker {
     if (!this.opts.skipHealthyMarker) {
       try {
         const healthyPath = join8(this.stateDir, "healthy");
-        writeFileSync3(healthyPath, String(this.now()) + `
+        writeFileSync2(healthyPath, String(this.now()) + `
 `, { mode: 384 });
       } catch (err) {
         this.logErr(`failed to write healthy marker: ${err.message}`);

package/dist/cli/ms-365-write-pretool.mjs

@@ -24,10 +24,33 @@ var GATED_MS365_WRITE_TOOLS = new Set([
   "update-message",
   "delete-message"
 ]);
+var KNOWN_SAFE_MS365_READ_TOOLS = new Set([
+  "list-files",
+  "list-drive-items",
+  "get-drive-item",
+  "download-bytes",
+  "search-files",
+  "list-events",
+  "get-event",
+  "list-calendars",
+  "get-calendar",
+  "list-messages",
+  "get-message",
+  "search-mail",
+  "list-mail-folders",
+  "get-mail-folder",
+  "whoami",
+  "get-current-user"
+]);
 function isGatedMs365Tool(toolName) {
   if (!toolName.startsWith(TOOL_PREFIX))
     return false;
-  return GATED_MS365_WRITE_TOOLS.has(toolName.slice(TOOL_PREFIX.length));
+  const bare = toolName.slice(TOOL_PREFIX.length);
+  if (bare.length === 0)
+    return false;
+  if (KNOWN_SAFE_MS365_READ_TOOLS.has(bare))
+    return false;
+  return true;
 }
 function readStdin() {
   try {
@@ -170,13 +193,12 @@ async function rpcKernel(payload) {
     });
   });
 }
-async function approvalLookup(agentUnit, scope, approverSet) {
+async function approvalLookupByRequest(agentUnit, requestId, approverSet) {
   const res = await rpcKernel({
     v: 1,
-    op: "approval_lookup",
+    op: "approval_lookup_by_request",
     agent_unit: agentUnit,
-    scope,
-    action: "write",
+    request_id: requestId,
     current_approver_set: approverSet
   });
   if (!res.ok)
@@ -203,7 +225,7 @@ async function main() {
   }
   const agentName = process.env.SWITCHROOM_AGENT_NAME;
   if (!agentName) {
-    allow();
+    fail("SWITCHROOM_AGENT_NAME unset \u2014 cannot identify agent to gate write");
   }
   const accountEmail = process.env.SWITCHROOM_MICROSOFT_ACCOUNT ?? "(unknown)";
   const extract = extractMs365Preview(toolName, input.tool_input);
@@ -230,11 +252,11 @@ async function main() {
   if (!response.ok || !response.requestId) {
     fail(response.reason ?? "gateway returned ok=false");
   }
+  const requestId = response.requestId;
   const deadline = response.expiresAtMs ?? Date.now() + HOOK_TIMEOUT_MS;
-  const scope = `ms-365:write:${preview.itemId}`;
   while (Date.now() < deadline) {
     await new Promise((r) => setTimeout(r, KERNEL_POLL_INTERVAL_MS));
-    const lookup = await approvalLookup(agentName, scope, []);
+    const lookup = await approvalLookupByRequest(agentName, requestId, []);
     if (!lookup)
       continue;
     const state = lookup.state;
@@ -255,5 +277,6 @@ if (__require.main == __require.module) {
 export {
   isGatedMs365Tool,
   extractMs365Preview,
+  KNOWN_SAFE_MS365_READ_TOOLS,
   GATED_MS365_WRITE_TOOLS
 };

package/dist/cli/notion-write-pretool.mjs

@@ -10928,7 +10928,7 @@ function decodeResponse(line) {
   const obj = JSON.parse(line);
   return ResponseSchema.parse(obj);
 }
-var MAX_FRAME_BYTES, AgentNameSchema, GetRequestSchema, PutRequestSchema, ListRequestSchema, MintGrantRequestSchema, ListGrantsRequestSchema, RevokeGrantRequestSchema, StatusRequestSchema, LockRequestSchema, PreflightAccessRequestSchema, OkPreflightAccessResponseSchema, ApprovalRequestRequestSchema, ApprovalLookupRequestSchema, ApprovalConsumeRequestSchema, ApprovalRevokeRequestSchema, ApprovalListRequestSchema, ApprovalDecisionModeSchema, ApprovalRecordRequestSchema, ApprovalConsumeRecordRequestSchema, RequestSchema, VaultEntrySchema, ErrorCode, OkEntryResponseSchema, OkKeysResponseSchema, BrokerStatus, OkStatusResponseSchema, OkLockResponseSchema, OkPutResponseSchema, OkMintGrantResponseSchema, GrantMetaSchema, OkListGrantsResponseSchema, OkRevokeGrantResponseSchema, OkApprovalRequestResponseSchema, ApprovalDecisionMetaSchema, OkApprovalLookupResponseSchema, OkApprovalConsumeResponseSchema, OkApprovalRevokeResponseSchema, OkApprovalListResponseSchema, OkApprovalRecordResponseSchema, OkApprovalConsumeRecordResponseSchema, ErrorResponseSchema, ResponseSchema;
+var MAX_FRAME_BYTES, AgentNameSchema, GetRequestSchema, PutRequestSchema, ListRequestSchema, MintGrantRequestSchema, ListGrantsRequestSchema, RevokeGrantRequestSchema, StatusRequestSchema, LockRequestSchema, PreflightAccessRequestSchema, OkPreflightAccessResponseSchema, ApprovalRequestRequestSchema, ApprovalLookupRequestSchema, ApprovalLookupByRequestRequestSchema, ApprovalConsumeRequestSchema, ApprovalRevokeRequestSchema, ApprovalListRequestSchema, ApprovalDecisionModeSchema, ApprovalRecordRequestSchema, ApprovalConsumeRecordRequestSchema, RequestSchema, VaultEntrySchema, ErrorCode, OkEntryResponseSchema, OkKeysResponseSchema, BrokerStatus, OkStatusResponseSchema, OkLockResponseSchema, OkPutResponseSchema, OkMintGrantResponseSchema, GrantMetaSchema, OkListGrantsResponseSchema, OkRevokeGrantResponseSchema, OkApprovalRequestResponseSchema, ApprovalDecisionMetaSchema, OkApprovalLookupResponseSchema, OkApprovalConsumeResponseSchema, OkApprovalRevokeResponseSchema, OkApprovalListResponseSchema, OkApprovalRecordResponseSchema, OkApprovalConsumeRecordResponseSchema, ErrorResponseSchema, ResponseSchema;
 var init_protocol = __esm(() => {
   init_zod();
   init_peercred();
@@ -11028,6 +11028,13 @@ var init_protocol = __esm(() => {
     action: exports_external.string().min(1),
     current_approver_set: exports_external.array(exports_external.string())
   });
+  ApprovalLookupByRequestRequestSchema = exports_external.object({
+    v: exports_external.literal(1),
+    op: exports_external.literal("approval_lookup_by_request"),
+    agent_unit: exports_external.string().min(1),
+    request_id: exports_external.string().regex(/^[0-9a-f]{32}$/),
+    current_approver_set: exports_external.array(exports_external.string())
+  });
   ApprovalConsumeRequestSchema = exports_external.object({
     v: exports_external.literal(1),
     op: exports_external.literal("approval_consume"),
@@ -11082,6 +11089,7 @@ var init_protocol = __esm(() => {
     RevokeGrantRequestSchema,
     ApprovalRequestRequestSchema,
     ApprovalLookupRequestSchema,
+    ApprovalLookupByRequestRequestSchema,
     ApprovalConsumeRequestSchema,
     ApprovalRevokeRequestSchema,
     ApprovalListRequestSchema,