@autohq/cli 0.1.599 → 0.1.601

package/dist/agent-bridge.js

@@ -33828,7 +33828,9 @@ var RUNTIME_BRIDGE_SOCKET_PATH = "/runtime/socket.io";
 var RUNTIME_BRIDGE_BOOTSTRAP_EVENT = "bridge.bootstrap";
 var RUNTIME_BRIDGE_CONNECTED_EVENT = "bridge.connected";
 var RUNTIME_BRIDGE_COMMAND_EVENT = "runtime.command";
+var RUNTIME_BRIDGE_LEASE_AUTHORIZATION_EVENT = "runtime.lease_authorization";
 var RUNTIME_BRIDGE_OUTPUT_EVENT = "runtime.output";
+var RUNTIME_BRIDGE_USAGE_TURN_EVENT = "runtime.usage_turn";
 var AgentBridgeMcpServerConfigSchema = external_exports.object({
   type: external_exports.literal("http"),
   url: external_exports.string().trim().min(1),
@@ -33938,6 +33940,19 @@ var RuntimeBridgeConnectedPayloadSchema = external_exports.object({
   runtimeId: RuntimeIdSchema,
   bridgeLeaseId: RuntimeBridgeLeaseIdSchema
 });
+var RuntimeBridgeLeaseAuthorizationRequestSchema = external_exports.object({
+  sessionId: SessionIdSchema,
+  runtimeId: RuntimeIdSchema,
+  bridgeLeaseId: RuntimeBridgeLeaseIdSchema
+}).strict();
+var RuntimeBridgeLeaseAuthorizationAckSchema = external_exports.object({
+  sessionId: SessionIdSchema,
+  runtimeId: RuntimeIdSchema,
+  bridgeLeaseId: RuntimeBridgeLeaseIdSchema,
+  status: external_exports.enum(["authorized", "failed"]),
+  error: external_exports.string().trim().min(1).optional(),
+  at: external_exports.string().datetime()
+}).strict();
 var RuntimeBridgeCommandDeliverySchema = external_exports.object({
   type: external_exports.literal("command.delivery"),
   deliveryId: external_exports.string().trim().min(1),
@@ -37736,7 +37751,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.599",
+  version: "0.1.601",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"
@@ -37937,6 +37952,8 @@ async function runAgentBridgeSocket(options) {
         token: options.token,
         onBootstrap: options.onBootstrap,
         createHandler: (bootstrap) => options.createHandler({
+          authorizeLease: (request) => authorizeLeaseWithAck(socket, request, options.runtimeLogger),
+          authorizeUsageTurn: (output) => emitUsageTurnWithAck(socket, output, options.runtimeLogger),
           emitOutput: (output) => emitOutputWithAck(socket, output, options.runtimeLogger),
           onOutputAckProgress: terminalAuthDrain.handleOutputAckProgress,
           cycleSocket: () => {
@@ -38150,19 +38167,109 @@ function createRuntimeBridgeBootstrapListener(input) {
   };
 }
 function emitOutputWithAck(socket, output, runtimeLogger) {
+  return emitRuntimeOutputWithAck({
+    event: RUNTIME_BRIDGE_OUTPUT_EVENT,
+    output,
+    runtimeLogger,
+    socket
+  });
+}
+function authorizeLeaseWithAck(socket, request, runtimeLogger) {
   const startedAt = Date.now();
-  runtimeLogger?.info(
+  runtimeLogger?.info("agent_bridge_lease_authorization_started", {
+    session_id: request.sessionId,
+    runtime_id: request.runtimeId,
+    bridge_lease_id: request.bridgeLeaseId,
+    socket_id: socket.id
+  });
+  return new Promise((resolve4, reject) => {
+    socket.timeout(AGENT_BRIDGE_OUTPUT_ACK_TIMEOUT_MS).emit(
+      RUNTIME_BRIDGE_LEASE_AUTHORIZATION_EVENT,
+      request,
+      (error51, rawAck) => {
+        if (error51) {
+          runtimeLogger?.warn("agent_bridge_lease_authorization_failed", {
+            session_id: request.sessionId,
+            runtime_id: request.runtimeId,
+            bridge_lease_id: request.bridgeLeaseId,
+            socket_id: socket.id,
+            duration_ms: Date.now() - startedAt,
+            error: error51.message
+          });
+          reject(
+            new AgentBridgeOutputAckTimeoutError(
+              `Bridge lease authorization ack timed out: ${error51.message}`
+            )
+          );
+          return;
+        }
+        const ack = RuntimeBridgeLeaseAuthorizationAckSchema.safeParse(rawAck);
+        if (!ack.success) {
+          runtimeLogger?.warn("agent_bridge_lease_authorization_invalid", {
+            session_id: request.sessionId,
+            runtime_id: request.runtimeId,
+            bridge_lease_id: request.bridgeLeaseId,
+            socket_id: socket.id,
+            duration_ms: Date.now() - startedAt,
+            error: ack.error.message
+          });
+          reject(
+            new Error(
+              `Invalid bridge lease authorization ack: ${ack.error.message}`
+            )
+          );
+          return;
+        }
+        if (ack.data.status === "failed") {
+          runtimeLogger?.warn("agent_bridge_lease_authorization_rejected", {
+            session_id: request.sessionId,
+            runtime_id: request.runtimeId,
+            bridge_lease_id: request.bridgeLeaseId,
+            socket_id: socket.id,
+            duration_ms: Date.now() - startedAt,
+            error: ack.data.error
+          });
+          reject(
+            new Error(
+              ack.data.error ?? "Bridge lease is no longer authorized"
+            )
+          );
+          return;
+        }
+        runtimeLogger?.info("agent_bridge_lease_authorization_ready", {
+          session_id: request.sessionId,
+          runtime_id: request.runtimeId,
+          bridge_lease_id: request.bridgeLeaseId,
+          socket_id: socket.id,
+          duration_ms: Date.now() - startedAt
+        });
+        resolve4(ack.data);
+      }
+    );
+  });
+}
+function emitUsageTurnWithAck(socket, output, runtimeLogger) {
+  return emitRuntimeOutputWithAck({
+    event: RUNTIME_BRIDGE_USAGE_TURN_EVENT,
+    output,
+    runtimeLogger,
+    socket
+  });
+}
+function emitRuntimeOutputWithAck(input) {
+  const startedAt = Date.now();
+  input.runtimeLogger?.info(
     "agent_bridge_output_emit_started",
-    outputLogContext(output, socket.id)
+    outputLogContext(input.output, input.socket.id)
   );
   return new Promise((resolve4, reject) => {
-    socket.timeout(AGENT_BRIDGE_OUTPUT_ACK_TIMEOUT_MS).emit(
-      RUNTIME_BRIDGE_OUTPUT_EVENT,
-      output,
+    input.socket.timeout(AGENT_BRIDGE_OUTPUT_ACK_TIMEOUT_MS).emit(
+      input.event,
+      input.output,
       (error51, rawAck) => {
         if (error51) {
-          runtimeLogger?.warn("agent_bridge_output_emit_ack_failed", {
-            ...outputLogContext(output, socket.id),
+          input.runtimeLogger?.warn("agent_bridge_output_emit_ack_failed", {
+            ...outputLogContext(input.output, input.socket.id),
             duration_ms: Date.now() - startedAt,
             error: error51.message
           });
@@ -38171,8 +38278,8 @@ function emitOutputWithAck(socket, output, runtimeLogger) {
         }
         const ack = RuntimeBridgeOutputAckSchema.safeParse(rawAck);
         if (!ack.success) {
-          runtimeLogger?.warn("agent_bridge_output_emit_ack_invalid", {
-            ...outputLogContext(output, socket.id),
+          input.runtimeLogger?.warn("agent_bridge_output_emit_ack_invalid", {
+            ...outputLogContext(input.output, input.socket.id),
             duration_ms: Date.now() - startedAt,
             error: ack.error.message
           });
@@ -38180,8 +38287,8 @@ function emitOutputWithAck(socket, output, runtimeLogger) {
           return;
         }
         if (ack.data.status === "failed") {
-          runtimeLogger?.warn("agent_bridge_output_emit_ack_rejected", {
-            ...outputLogContext(output, socket.id),
+          input.runtimeLogger?.warn("agent_bridge_output_emit_ack_rejected", {
+            ...outputLogContext(input.output, input.socket.id),
             duration_ms: Date.now() - startedAt,
             ack_status: ack.data.status,
             error: ack.data.error
@@ -38191,8 +38298,8 @@ function emitOutputWithAck(socket, output, runtimeLogger) {
           );
           return;
         }
-        runtimeLogger?.info("agent_bridge_output_emit_ack_ready", {
-          ...outputLogContext(output, socket.id),
+        input.runtimeLogger?.info("agent_bridge_output_emit_ack_ready", {
+          ...outputLogContext(input.output, input.socket.id),
           duration_ms: Date.now() - startedAt,
           ack_status: ack.data.status,
           cursor: ack.data.cursor
@@ -78551,7 +78658,7 @@ var AskUserServer = class {
         {
           name: ASK_USER_MCP_TOOL_NAME,
           title: ASK_USER_TOOL_NAME,
-          description: "Ask the user one to four blocking questions and wait for their answer.",
+          description: "Ask the user one to four blocking questions and wait for their answer. This call returns only after the prompt is answered or explicitly falls back; an answered result means the prompt is closed, so continue exactly once using that answer and never report that it is still awaiting the user.",
           inputSchema: external_exports.toJSONSchema(AskUserQuestionInputSchema2)
         }
       ]
@@ -78618,7 +78725,8 @@ function settlementResult(settlement) {
       {
         type: "text",
         text: [
-          "The user answered your questions:",
+          "Question resolved: the user answered and this prompt is now closed.",
+          "Continue exactly once using these answers; do not say or imply that the question is still open or awaiting the user:",
           ...lines,
           ...answer.response ? [`The user also responded: ${answer.response}`] : []
         ].join("\n")
@@ -83757,6 +83865,15 @@ var AgentBridgeOutputBuffer = class {
     await this.flushPendingDelta();
     await this.enqueueProjectionAndDrain(context, projection, options);
   }
+  async enqueueEntryProjection(context, projection) {
+    await this.materializePendingUiDelta();
+    this.materializePendingDelta();
+    this.outputSeq += 1;
+    this.enqueueOutput(
+      buildOutputEnvelope(context, this.outputSeq, projection)
+    );
+    return { drained: this.drainPendingOutputs() };
+  }
   async replayPendingOutputs() {
     await this.materializePendingUiDelta();
     await this.flushPendingDelta({ force: true });
@@ -83805,17 +83922,18 @@ var AgentBridgeOutputBuffer = class {
    * could attribute a billed call to the preceding turn.
    */
   async emitUsageTurn(context, turnId) {
-    this.outputSeq += 1;
-    this.enqueueOutput(
-      buildUsageTurnOutputEnvelope({
-        context,
-        outputSeq: this.outputSeq,
-        turnId,
-        createdAt: now2()
-      })
-    );
+    this.enqueueOutput(this.nextUsageTurnOutput(context, turnId));
     await this.drainPendingOutputs({ failIfBlocked: true });
   }
+  nextUsageTurnOutput(context, turnId) {
+    this.outputSeq += 1;
+    return buildUsageTurnOutputEnvelope({
+      context,
+      outputSeq: this.outputSeq,
+      turnId,
+      createdAt: now2()
+    });
+  }
   async emitUiMessageChunk(context, projection) {
     await this.flushPendingDelta();
     await this.emitLiveUiMessageChunk(context, projection.chunk);
@@ -84084,6 +84202,13 @@ var AgentBridgeOutputBuffer = class {
     this.deltaFlushTimer = null;
   }
   async flushPendingDelta(options = {}) {
+    if (!this.pendingDelta) {
+      return;
+    }
+    this.materializePendingDelta();
+    await this.drainPendingOutputs(options);
+  }
+  materializePendingDelta() {
     const pendingDelta = this.pendingDelta;
     if (!pendingDelta) {
       return;
@@ -84091,14 +84216,14 @@ var AgentBridgeOutputBuffer = class {
     this.clearDeltaFlushTimer();
     this.pendingDelta = null;
     this.outputSeq += 1;
-    const output = buildDeltaOutputEnvelope({
-      context: pendingDelta.context,
-      outputSeq: this.outputSeq,
-      delta: pendingDelta.delta,
-      createdAt: pendingDelta.createdAt
-    });
-    this.enqueueOutput(output);
-    await this.drainPendingOutputs(options);
+    this.enqueueOutput(
+      buildDeltaOutputEnvelope({
+        context: pendingDelta.context,
+        outputSeq: this.outputSeq,
+        delta: pendingDelta.delta,
+        createdAt: pendingDelta.createdAt
+      })
+    );
   }
   async emitUntilAcked(output) {
     for (let attempt = 0; ; attempt += 1) {
@@ -84624,7 +84749,7 @@ function buildLivenessOutputEnvelope(input) {
 }
 function buildUsageTurnOutputEnvelope(input) {
   const { context } = input;
-  return RuntimeBridgeOutputEnvelopeSchema.parse({
+  return RuntimeBridgeOutputUsageTurnEnvelopeSchema.parse({
     type: "runtime.usage_turn",
     sessionId: context.sessionId,
     runtimeId: context.runtimeId,
@@ -87129,30 +87254,24 @@ var ClaudeCodeCommandHandler = class {
   // original delivery and any redeliveries, so failures travel as values.
   async injectMessageCommand(activeContext, delivery, message, socketId) {
     try {
-      const emitStartedAt = Date.now();
-      this.input.runtimeLogger?.info(
-        "agent_bridge_claude_command_user_entry_emit_started",
-        commandLogContext(delivery, { socket_id: socketId })
-      );
-      await this.emitRequiredBridgeOutput(activeContext, {
-        type: "entry",
-        entry: {
-          messageId: delivery.commandId,
-          role: "user",
-          kind: "message",
-          status: "completed",
-          content: {
-            parts: [{ type: "text", text: message }]
-          }
+      const enqueueStartedAt = Date.now();
+      await this.enqueueUserEntryBridgeOutput(activeContext, {
+        messageId: delivery.commandId,
+        role: "user",
+        kind: "message",
+        status: "completed",
+        content: {
+          parts: [{ type: "text", text: message }]
         }
       });
       this.input.runtimeLogger?.info(
-        "agent_bridge_claude_command_user_entry_emit_ready",
+        "agent_bridge_claude_command_user_entry_enqueued",
         commandLogContext(delivery, {
           socket_id: socketId,
-          duration_ms: Date.now() - emitStartedAt
+          duration_ms: Date.now() - enqueueStartedAt
         })
       );
+      await this.input.authorizeLease(activeContext);
       const sendStartedAt = Date.now();
       const mode = deliveryMode(delivery);
       this.applySelectionForMessage(delivery);
@@ -87246,18 +87365,16 @@ var ClaudeCodeCommandHandler = class {
       return;
     }
     const message = answerFallbackMessage(answer);
-    await this.emitRequiredBridgeOutput(activeContext, {
-      type: "entry",
-      entry: {
-        messageId: delivery.commandId,
-        role: "user",
-        kind: "message",
-        status: "completed",
-        content: {
-          parts: [{ type: "text", text: message }]
-        }
+    await this.enqueueUserEntryBridgeOutput(activeContext, {
+      messageId: delivery.commandId,
+      role: "user",
+      kind: "message",
+      status: "completed",
+      content: {
+        parts: [{ type: "text", text: message }]
       }
     });
+    await this.input.authorizeLease(activeContext);
     await this.ensureAgentSession().sendMessage(message, {
       commandId: delivery.commandId
     });
@@ -87339,7 +87456,13 @@ var ClaudeCodeCommandHandler = class {
     if (!activeContext) {
       throw new Error("Cannot publish usage turn without bridge context");
     }
-    await this.outputBuffer.emitUsageTurn(activeContext, turnId);
+    if (turnId) {
+      await this.input.authorizeUsageTurn(
+        this.outputBuffer.nextUsageTurnOutput(activeContext, turnId)
+      );
+      return;
+    }
+    await this.outputBuffer.emitUsageTurn(activeContext, null);
   }
   async emitBridgeOutput(activeContext, projection) {
     try {
@@ -87350,6 +87473,17 @@ var ClaudeCodeCommandHandler = class {
       );
     }
   }
+  async enqueueUserEntryBridgeOutput(activeContext, entry) {
+    const { drained } = await this.outputBuffer.enqueueEntryProjection(
+      activeContext,
+      { type: "entry", entry }
+    );
+    drained.catch((error51) => {
+      this.input.writeOutput?.(
+        `agent_bridge_output_emit_failed error=${error51 instanceof Error ? error51.message : String(error51)}`
+      );
+    });
+  }
   async emitRequiredBridgeOutput(activeContext, projection) {
     const options = {
       discardOnFailure: true,
@@ -90137,6 +90271,8 @@ function createHarnessCommandHandler(input) {
       const { kind, ...claude } = config2;
       return createClaudeCodeCommandHandler({
         ...base,
+        authorizeLease: input.authorizeLease,
+        authorizeUsageTurn: input.authorizeUsageTurn,
         claude,
         readState: fileClaudeReadStateStore(),
         sessionResume: fileClaudeSessionResumeStore()

package/dist/index.js

@@ -91158,7 +91158,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.599",
+      version: "0.1.601",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -102110,7 +102110,9 @@ var RUNTIME_BRIDGE_SOCKET_PATH = "/runtime/socket.io";
 var RUNTIME_BRIDGE_BOOTSTRAP_EVENT = "bridge.bootstrap";
 var RUNTIME_BRIDGE_CONNECTED_EVENT = "bridge.connected";
 var RUNTIME_BRIDGE_COMMAND_EVENT = "runtime.command";
+var RUNTIME_BRIDGE_LEASE_AUTHORIZATION_EVENT = "runtime.lease_authorization";
 var RUNTIME_BRIDGE_OUTPUT_EVENT = "runtime.output";
+var RUNTIME_BRIDGE_USAGE_TURN_EVENT = "runtime.usage_turn";
 var AgentBridgeMcpServerConfigSchema = external_exports.object({
   type: external_exports.literal("http"),
   url: external_exports.string().trim().min(1),
@@ -102220,6 +102222,19 @@ var RuntimeBridgeConnectedPayloadSchema = external_exports.object({
   runtimeId: RuntimeIdSchema2,
   bridgeLeaseId: RuntimeBridgeLeaseIdSchema2
 });
+var RuntimeBridgeLeaseAuthorizationRequestSchema = external_exports.object({
+  sessionId: SessionIdSchema2,
+  runtimeId: RuntimeIdSchema2,
+  bridgeLeaseId: RuntimeBridgeLeaseIdSchema2
+}).strict();
+var RuntimeBridgeLeaseAuthorizationAckSchema = external_exports.object({
+  sessionId: SessionIdSchema2,
+  runtimeId: RuntimeIdSchema2,
+  bridgeLeaseId: RuntimeBridgeLeaseIdSchema2,
+  status: external_exports.enum(["authorized", "failed"]),
+  error: external_exports.string().trim().min(1).optional(),
+  at: external_exports.string().datetime()
+}).strict();
 var RuntimeBridgeCommandDeliverySchema = external_exports.object({
   type: external_exports.literal("command.delivery"),
   deliveryId: external_exports.string().trim().min(1),
@@ -102607,6 +102622,8 @@ async function runAgentBridgeSocket(options) {
         token: options.token,
         onBootstrap: options.onBootstrap,
         createHandler: (bootstrap) => options.createHandler({
+          authorizeLease: (request) => authorizeLeaseWithAck(socket, request, options.runtimeLogger),
+          authorizeUsageTurn: (output) => emitUsageTurnWithAck(socket, output, options.runtimeLogger),
           emitOutput: (output) => emitOutputWithAck(socket, output, options.runtimeLogger),
           onOutputAckProgress: terminalAuthDrain.handleOutputAckProgress,
           cycleSocket: () => {
@@ -102820,19 +102837,109 @@ function createRuntimeBridgeBootstrapListener(input) {
   };
 }
 function emitOutputWithAck(socket, output, runtimeLogger) {
+  return emitRuntimeOutputWithAck({
+    event: RUNTIME_BRIDGE_OUTPUT_EVENT,
+    output,
+    runtimeLogger,
+    socket
+  });
+}
+function authorizeLeaseWithAck(socket, request, runtimeLogger) {
   const startedAt = Date.now();
-  runtimeLogger?.info(
+  runtimeLogger?.info("agent_bridge_lease_authorization_started", {
+    session_id: request.sessionId,
+    runtime_id: request.runtimeId,
+    bridge_lease_id: request.bridgeLeaseId,
+    socket_id: socket.id
+  });
+  return new Promise((resolve6, reject) => {
+    socket.timeout(AGENT_BRIDGE_OUTPUT_ACK_TIMEOUT_MS).emit(
+      RUNTIME_BRIDGE_LEASE_AUTHORIZATION_EVENT,
+      request,
+      (error51, rawAck) => {
+        if (error51) {
+          runtimeLogger?.warn("agent_bridge_lease_authorization_failed", {
+            session_id: request.sessionId,
+            runtime_id: request.runtimeId,
+            bridge_lease_id: request.bridgeLeaseId,
+            socket_id: socket.id,
+            duration_ms: Date.now() - startedAt,
+            error: error51.message
+          });
+          reject(
+            new AgentBridgeOutputAckTimeoutError(
+              `Bridge lease authorization ack timed out: ${error51.message}`
+            )
+          );
+          return;
+        }
+        const ack = RuntimeBridgeLeaseAuthorizationAckSchema.safeParse(rawAck);
+        if (!ack.success) {
+          runtimeLogger?.warn("agent_bridge_lease_authorization_invalid", {
+            session_id: request.sessionId,
+            runtime_id: request.runtimeId,
+            bridge_lease_id: request.bridgeLeaseId,
+            socket_id: socket.id,
+            duration_ms: Date.now() - startedAt,
+            error: ack.error.message
+          });
+          reject(
+            new Error(
+              `Invalid bridge lease authorization ack: ${ack.error.message}`
+            )
+          );
+          return;
+        }
+        if (ack.data.status === "failed") {
+          runtimeLogger?.warn("agent_bridge_lease_authorization_rejected", {
+            session_id: request.sessionId,
+            runtime_id: request.runtimeId,
+            bridge_lease_id: request.bridgeLeaseId,
+            socket_id: socket.id,
+            duration_ms: Date.now() - startedAt,
+            error: ack.data.error
+          });
+          reject(
+            new Error(
+              ack.data.error ?? "Bridge lease is no longer authorized"
+            )
+          );
+          return;
+        }
+        runtimeLogger?.info("agent_bridge_lease_authorization_ready", {
+          session_id: request.sessionId,
+          runtime_id: request.runtimeId,
+          bridge_lease_id: request.bridgeLeaseId,
+          socket_id: socket.id,
+          duration_ms: Date.now() - startedAt
+        });
+        resolve6(ack.data);
+      }
+    );
+  });
+}
+function emitUsageTurnWithAck(socket, output, runtimeLogger) {
+  return emitRuntimeOutputWithAck({
+    event: RUNTIME_BRIDGE_USAGE_TURN_EVENT,
+    output,
+    runtimeLogger,
+    socket
+  });
+}
+function emitRuntimeOutputWithAck(input) {
+  const startedAt = Date.now();
+  input.runtimeLogger?.info(
     "agent_bridge_output_emit_started",
-    outputLogContext(output, socket.id)
+    outputLogContext(input.output, input.socket.id)
   );
   return new Promise((resolve6, reject) => {
-    socket.timeout(AGENT_BRIDGE_OUTPUT_ACK_TIMEOUT_MS).emit(
-      RUNTIME_BRIDGE_OUTPUT_EVENT,
-      output,
+    input.socket.timeout(AGENT_BRIDGE_OUTPUT_ACK_TIMEOUT_MS).emit(
+      input.event,
+      input.output,
       (error51, rawAck) => {
         if (error51) {
-          runtimeLogger?.warn("agent_bridge_output_emit_ack_failed", {
-            ...outputLogContext(output, socket.id),
+          input.runtimeLogger?.warn("agent_bridge_output_emit_ack_failed", {
+            ...outputLogContext(input.output, input.socket.id),
             duration_ms: Date.now() - startedAt,
             error: error51.message
           });
@@ -102841,8 +102948,8 @@ function emitOutputWithAck(socket, output, runtimeLogger) {
         }
         const ack = RuntimeBridgeOutputAckSchema.safeParse(rawAck);
         if (!ack.success) {
-          runtimeLogger?.warn("agent_bridge_output_emit_ack_invalid", {
-            ...outputLogContext(output, socket.id),
+          input.runtimeLogger?.warn("agent_bridge_output_emit_ack_invalid", {
+            ...outputLogContext(input.output, input.socket.id),
             duration_ms: Date.now() - startedAt,
             error: ack.error.message
           });
@@ -102850,8 +102957,8 @@ function emitOutputWithAck(socket, output, runtimeLogger) {
           return;
         }
         if (ack.data.status === "failed") {
-          runtimeLogger?.warn("agent_bridge_output_emit_ack_rejected", {
-            ...outputLogContext(output, socket.id),
+          input.runtimeLogger?.warn("agent_bridge_output_emit_ack_rejected", {
+            ...outputLogContext(input.output, input.socket.id),
             duration_ms: Date.now() - startedAt,
             ack_status: ack.data.status,
             error: ack.data.error
@@ -102861,8 +102968,8 @@ function emitOutputWithAck(socket, output, runtimeLogger) {
           );
           return;
         }
-        runtimeLogger?.info("agent_bridge_output_emit_ack_ready", {
-          ...outputLogContext(output, socket.id),
+        input.runtimeLogger?.info("agent_bridge_output_emit_ack_ready", {
+          ...outputLogContext(input.output, input.socket.id),
           duration_ms: Date.now() - startedAt,
           ack_status: ack.data.status,
           cursor: ack.data.cursor
@@ -104307,7 +104414,7 @@ var AskUserServer = class {
         {
           name: ASK_USER_MCP_TOOL_NAME,
           title: ASK_USER_TOOL_NAME,
-          description: "Ask the user one to four blocking questions and wait for their answer.",
+          description: "Ask the user one to four blocking questions and wait for their answer. This call returns only after the prompt is answered or explicitly falls back; an answered result means the prompt is closed, so continue exactly once using that answer and never report that it is still awaiting the user.",
           inputSchema: external_exports.toJSONSchema(AskUserQuestionInputSchema2)
         }
       ]
@@ -104374,7 +104481,8 @@ function settlementResult(settlement) {
       {
         type: "text",
         text: [
-          "The user answered your questions:",
+          "Question resolved: the user answered and this prompt is now closed.",
+          "Continue exactly once using these answers; do not say or imply that the question is still open or awaiting the user:",
           ...lines,
           ...answer.response ? [`The user also responded: ${answer.response}`] : []
         ].join("\n")
@@ -105190,6 +105298,15 @@ var AgentBridgeOutputBuffer = class {
     await this.flushPendingDelta();
     await this.enqueueProjectionAndDrain(context, projection, options);
   }
+  async enqueueEntryProjection(context, projection) {
+    await this.materializePendingUiDelta();
+    this.materializePendingDelta();
+    this.outputSeq += 1;
+    this.enqueueOutput(
+      buildOutputEnvelope(context, this.outputSeq, projection)
+    );
+    return { drained: this.drainPendingOutputs() };
+  }
   async replayPendingOutputs() {
     await this.materializePendingUiDelta();
     await this.flushPendingDelta({ force: true });
@@ -105238,17 +105355,18 @@ var AgentBridgeOutputBuffer = class {
    * could attribute a billed call to the preceding turn.
    */
   async emitUsageTurn(context, turnId) {
-    this.outputSeq += 1;
-    this.enqueueOutput(
-      buildUsageTurnOutputEnvelope({
-        context,
-        outputSeq: this.outputSeq,
-        turnId,
-        createdAt: now2()
-      })
-    );
+    this.enqueueOutput(this.nextUsageTurnOutput(context, turnId));
     await this.drainPendingOutputs({ failIfBlocked: true });
   }
+  nextUsageTurnOutput(context, turnId) {
+    this.outputSeq += 1;
+    return buildUsageTurnOutputEnvelope({
+      context,
+      outputSeq: this.outputSeq,
+      turnId,
+      createdAt: now2()
+    });
+  }
   async emitUiMessageChunk(context, projection) {
     await this.flushPendingDelta();
     await this.emitLiveUiMessageChunk(context, projection.chunk);
@@ -105517,6 +105635,13 @@ var AgentBridgeOutputBuffer = class {
     this.deltaFlushTimer = null;
   }
   async flushPendingDelta(options = {}) {
+    if (!this.pendingDelta) {
+      return;
+    }
+    this.materializePendingDelta();
+    await this.drainPendingOutputs(options);
+  }
+  materializePendingDelta() {
     const pendingDelta = this.pendingDelta;
     if (!pendingDelta) {
       return;
@@ -105524,14 +105649,14 @@ var AgentBridgeOutputBuffer = class {
     this.clearDeltaFlushTimer();
     this.pendingDelta = null;
     this.outputSeq += 1;
-    const output = buildDeltaOutputEnvelope({
-      context: pendingDelta.context,
-      outputSeq: this.outputSeq,
-      delta: pendingDelta.delta,
-      createdAt: pendingDelta.createdAt
-    });
-    this.enqueueOutput(output);
-    await this.drainPendingOutputs(options);
+    this.enqueueOutput(
+      buildDeltaOutputEnvelope({
+        context: pendingDelta.context,
+        outputSeq: this.outputSeq,
+        delta: pendingDelta.delta,
+        createdAt: pendingDelta.createdAt
+      })
+    );
   }
   async emitUntilAcked(output) {
     for (let attempt = 0; ; attempt += 1) {
@@ -106057,7 +106182,7 @@ function buildLivenessOutputEnvelope(input) {
 }
 function buildUsageTurnOutputEnvelope(input) {
   const { context } = input;
-  return RuntimeBridgeOutputEnvelopeSchema.parse({
+  return RuntimeBridgeOutputUsageTurnEnvelopeSchema.parse({
     type: "runtime.usage_turn",
     sessionId: context.sessionId,
     runtimeId: context.runtimeId,
@@ -108569,30 +108694,24 @@ var ClaudeCodeCommandHandler = class {
   // original delivery and any redeliveries, so failures travel as values.
   async injectMessageCommand(activeContext, delivery, message, socketId) {
     try {
-      const emitStartedAt = Date.now();
-      this.input.runtimeLogger?.info(
-        "agent_bridge_claude_command_user_entry_emit_started",
-        commandLogContext(delivery, { socket_id: socketId })
-      );
-      await this.emitRequiredBridgeOutput(activeContext, {
-        type: "entry",
-        entry: {
-          messageId: delivery.commandId,
-          role: "user",
-          kind: "message",
-          status: "completed",
-          content: {
-            parts: [{ type: "text", text: message }]
-          }
+      const enqueueStartedAt = Date.now();
+      await this.enqueueUserEntryBridgeOutput(activeContext, {
+        messageId: delivery.commandId,
+        role: "user",
+        kind: "message",
+        status: "completed",
+        content: {
+          parts: [{ type: "text", text: message }]
         }
       });
       this.input.runtimeLogger?.info(
-        "agent_bridge_claude_command_user_entry_emit_ready",
+        "agent_bridge_claude_command_user_entry_enqueued",
         commandLogContext(delivery, {
           socket_id: socketId,
-          duration_ms: Date.now() - emitStartedAt
+          duration_ms: Date.now() - enqueueStartedAt
         })
       );
+      await this.input.authorizeLease(activeContext);
       const sendStartedAt = Date.now();
       const mode = deliveryMode(delivery);
       this.applySelectionForMessage(delivery);
@@ -108686,18 +108805,16 @@ var ClaudeCodeCommandHandler = class {
       return;
     }
     const message = answerFallbackMessage(answer);
-    await this.emitRequiredBridgeOutput(activeContext, {
-      type: "entry",
-      entry: {
-        messageId: delivery.commandId,
-        role: "user",
-        kind: "message",
-        status: "completed",
-        content: {
-          parts: [{ type: "text", text: message }]
-        }
+    await this.enqueueUserEntryBridgeOutput(activeContext, {
+      messageId: delivery.commandId,
+      role: "user",
+      kind: "message",
+      status: "completed",
+      content: {
+        parts: [{ type: "text", text: message }]
       }
     });
+    await this.input.authorizeLease(activeContext);
     await this.ensureAgentSession().sendMessage(message, {
       commandId: delivery.commandId
     });
@@ -108779,7 +108896,13 @@ var ClaudeCodeCommandHandler = class {
     if (!activeContext) {
       throw new Error("Cannot publish usage turn without bridge context");
     }
-    await this.outputBuffer.emitUsageTurn(activeContext, turnId);
+    if (turnId) {
+      await this.input.authorizeUsageTurn(
+        this.outputBuffer.nextUsageTurnOutput(activeContext, turnId)
+      );
+      return;
+    }
+    await this.outputBuffer.emitUsageTurn(activeContext, null);
   }
   async emitBridgeOutput(activeContext, projection) {
     try {
@@ -108790,6 +108913,17 @@ var ClaudeCodeCommandHandler = class {
       );
     }
   }
+  async enqueueUserEntryBridgeOutput(activeContext, entry) {
+    const { drained } = await this.outputBuffer.enqueueEntryProjection(
+      activeContext,
+      { type: "entry", entry }
+    );
+    drained.catch((error51) => {
+      this.input.writeOutput?.(
+        `agent_bridge_output_emit_failed error=${error51 instanceof Error ? error51.message : String(error51)}`
+      );
+    });
+  }
   async emitRequiredBridgeOutput(activeContext, projection) {
     const options = {
       discardOnFailure: true,
@@ -111582,6 +111716,8 @@ function createHarnessCommandHandler(input) {
       const { kind, ...claude } = config2;
       return createClaudeCodeCommandHandler({
         ...base,
+        authorizeLease: input.authorizeLease,
+        authorizeUsageTurn: input.authorizeUsageTurn,
         claude,
         readState: fileClaudeReadStateStore(),
         sessionResume: fileClaudeSessionResumeStore()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autohq/cli",
-  "version": "0.1.599",
+  "version": "0.1.601",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"