@threadbase-sh/streamer 1.69.3 → 1.69.5

package/dist/index.js

@@ -4089,7 +4089,7 @@ async function readGitBranch(dir) {
 // src/server.ts
 import { createNodeWebSocket } from "@hono/node-ws";
 import { Connection, Client as TemporalClient } from "@temporalio/client";
-import { randomUUID as randomUUID5 } from "crypto";
+import { randomUUID as randomUUID6 } from "crypto";
 import { EventEmitter } from "events";
 import { existsSync as existsSync16 } from "fs";
 import { realpath as realpath2 } from "fs/promises";
@@ -9211,6 +9211,7 @@ var ConversationHandlers = class {
 };
 
 // src/api/handlers/sessions.handlers.ts
+import { randomUUID as randomUUID4 } from "crypto";
 import { existsSync as existsSync10 } from "fs";
 import { basename as basename6, dirname as dirname9, join as join16 } from "path";
 
@@ -9582,19 +9583,39 @@ var UnknownOptionError = class extends Error {
   question;
   value;
 };
+var UnsupportedPromptShapeError = class extends Error {
+  constructor(detail) {
+    super(`Unsupported prompt shape: ${detail}`);
+    this.detail = detail;
+    this.name = "UnsupportedPromptShapeError";
+  }
+  detail;
+};
+var IncompleteAnswerError = class extends Error {
+  constructor(question) {
+    super(`Missing answer for question "${question}"`);
+    this.question = question;
+    this.name = "IncompleteAnswerError";
+  }
+  question;
+};
 function answersToKeystrokes(questions, answers) {
-  let out = "";
-  for (const q of questions) {
-    const raw = answers[q.question];
-    if (raw === void 0) {
-      throw new Error(`Missing answer for question "${q.question}"`);
-    }
-    const label = Array.isArray(raw) ? raw[0] : raw;
-    const target = q.options.findIndex((o) => o.label === label);
-    if (target < 0) throw new UnknownOptionError(q.question, label);
-    out += DOWN.repeat(target) + ENTER3;
+  if (questions.length !== 1) {
+    throw new UnsupportedPromptShapeError(`${questions.length} questions`);
   }
-  return out;
+  const q = questions[0];
+  if (q.multiSelect) throw new UnsupportedPromptShapeError("multiSelect");
+  const raw = answers[q.question];
+  if (raw === void 0 || Array.isArray(raw) && raw.length === 0) {
+    throw new IncompleteAnswerError(q.question);
+  }
+  if (Array.isArray(raw) && raw.length > 1) {
+    throw new UnsupportedPromptShapeError(`${raw.length} labels for a single-select question`);
+  }
+  const label = Array.isArray(raw) ? raw[0] : raw;
+  const target = q.options.findIndex((o) => o.label === label);
+  if (target < 0) throw new UnknownOptionError(q.question, label);
+  return DOWN.repeat(target) + ENTER3;
 }
 
 // src/services/questions/resolveAnswer.ts
@@ -9608,6 +9629,10 @@ function resolveAnswer(pending, body) {
     return { ok: true, keys: answersToKeystrokes(pending.questions, answers) };
   } catch (e) {
     if (e instanceof UnknownOptionError) return { ok: false, reason: "unknown_option" };
+    if (e instanceof UnsupportedPromptShapeError) {
+      return { ok: false, reason: "unsupported_prompt_shape" };
+    }
+    if (e instanceof IncompleteAnswerError) return { ok: false, reason: "incomplete_answer" };
     throw e;
   }
 }
@@ -10506,7 +10531,9 @@ var SessionHandlers = class {
     }
     const key = permissionContentKey(gate);
     if (this.pendingPermissionKey.get(sessionId) === key) return;
-    this.pendingPermission.set(sessionId, gate);
+    const prior = this.pendingPermission.get(sessionId);
+    const gateId = prior && permissionGateKey(prior) === permissionGateKey(gate) ? prior.gateId : randomUUID4();
+    this.pendingPermission.set(sessionId, { ...gate, gateId });
     this.pendingPermissionKey.set(sessionId, key);
     const subscriberCount = this.sessionSubscribers.get(sessionId)?.size ?? 0;
     this.log.info(
@@ -10520,7 +10547,8 @@ var SessionHandlers = class {
       ...gate.detail ? { detail: gate.detail } : {},
       options: gate.options,
       ...gate.cursor !== void 0 ? { cursor: gate.cursor } : {},
-      contentKey: permissionGateKey(gate)
+      contentKey: permissionGateKey(gate),
+      gateId
     });
   }
   /**
@@ -10548,10 +10576,15 @@ var SessionHandlers = class {
     const body = await readBody2(req);
     const contentKey = body?.contentKey;
     const optionIndex = body?.optionIndex;
+    const gateId = body?.gateId;
     if (typeof contentKey !== "string" || !Number.isInteger(optionIndex) || optionIndex < 0) {
       json(res, 400, { ok: false, reason: "Expected { contentKey: string, optionIndex: number }" });
       return;
     }
+    if (gateId !== void 0 && typeof gateId !== "string") {
+      json(res, 400, { ok: false, reason: "Expected gateId to be a string" });
+      return;
+    }
     const gateClosed = () => {
       this.pendingPermission.delete(sessionId);
       this.pendingPermissionKey.delete(sessionId);
@@ -10563,6 +10596,16 @@ var SessionHandlers = class {
       gateClosed();
       return;
     }
+    if (gateId !== void 0 && gateId !== gate.gateId) {
+      json(res, 409, { ok: false, reason: "gate_mismatch" });
+      return;
+    }
+    if (gateId === void 0) {
+      this.log.info(`[permission.answer_legacy_identity] ${sessionId.slice(0, 8)}`, {
+        event: "permission.answer_legacy_identity",
+        sessionId
+      });
+    }
     if (permissionGateKey(gate) !== contentKey) {
       json(res, 409, { ok: false, reason: "gate_mismatch" });
       return;
@@ -10572,7 +10615,8 @@ var SessionHandlers = class {
       json(res, 409, { ok: false, reason: "unknown_option" });
       return;
     }
-    if (!await this.permissionGateStillOpen(sessionId, contentKey)) {
+    const provider = this.sessionStore.getManaged(sessionId)?.provider;
+    if (provider !== CODEX_CLI_PROVIDER && !await this.permissionGateStillOpen(sessionId, contentKey)) {
       gateClosed();
       return;
     }
@@ -10616,7 +10660,14 @@ var SessionHandlers = class {
     const pending = this.pendingQuestions.get(sessionId);
     const resolution = resolveAnswer(pending, body);
     if (!resolution.ok) {
-      json(res, 400, { ok: false, reason: resolution.reason });
+      const unanswerable = resolution.reason === "unsupported_prompt_shape" || resolution.reason === "incomplete_answer";
+      json(res, 400, {
+        ok: false,
+        reason: resolution.reason,
+        ...unanswerable ? {
+          error: "This prompt needs an answer the app cannot give yet; answer it in the terminal"
+        } : {}
+      });
       return;
     }
     const toolUseId = pending?.toolUseId ?? "";
@@ -11280,7 +11331,7 @@ var ManagedSessionsRepository = class {
 };
 
 // src/db/repositories/projects.repository.ts
-import { randomUUID as randomUUID4 } from "crypto";
+import { randomUUID as randomUUID5 } from "crypto";
 function rowToProject(row) {
   return {
     id: row.id,
@@ -11365,7 +11416,7 @@ var ProjectsRepository = class {
       });
       return rowToProject(this.getById.get(existing.id));
     }
-    const id = randomUUID4();
+    const id = randomUUID5();
     this.insert.run({
       id,
       path,
@@ -13142,7 +13193,8 @@ function createApiDeps(deps) {
                 ...pendingGate.detail ? { detail: pendingGate.detail } : {},
                 options: pendingGate.options,
                 ...pendingGate.cursor !== void 0 ? { cursor: pendingGate.cursor } : {},
-                contentKey: permissionGateKey(pendingGate)
+                contentKey: permissionGateKey(pendingGate),
+                gateId: pendingGate.gateId
               })
             );
           }
@@ -16000,7 +16052,7 @@ var StreamerServer = class {
   runtimeStore = null;
   // Identifies this streamer run. A registry row carrying a different id is a
   // session that outlived the process that started it.
-  streamerInstanceId = randomUUID5();
+  streamerInstanceId = randomUUID6();
   cacheMetadataRepo = null;
   // Push registration + delivery state (C7). Null when the cache DB failed to
   // open — registration then degrades to a no-op rather than 500ing.