@autohq/cli 0.1.187 → 0.1.196

package/dist/index.js

@@ -16491,12 +16491,13 @@ var init_connections = __esm({
 });
 
 // ../../packages/schemas/src/github-sync.ts
-var GITHUB_SYNC_AUTO_PATH, GithubSyncRepositoryFullNameSchema, GithubSyncProductionBranchSchema, GithubSyncBindingSchema, GithubSyncBindingCreateRequestSchema, GithubSyncBindingCreateResponseSchema, GithubSyncBindingListResponseSchema, GithubSyncWorkflowInputSchema, GithubSyncWorkflowResultSchema;
+var GITHUB_SYNC_AUTO_PATH, GithubSyncRepositoryFullNameSchema, GithubSyncProductionBranchSchema, GithubSyncBindingSchema, GithubSyncBindingCreateRequestSchema, GithubSyncBindingCreateResponseSchema, GithubSyncBindingListResponseSchema, GithubSyncTriggerArtifactSchema, GithubSyncWorkflowInputSchema, GithubSyncWorkflowResultSchema;
 var init_github_sync = __esm({
   "../../packages/schemas/src/github-sync.ts"() {
     "use strict";
     init_zod();
     init_ids();
+    init_primitives();
     GITHUB_SYNC_AUTO_PATH = ".auto";
     GithubSyncRepositoryFullNameSchema = external_exports.string().trim().min(1).regex(/^[^/\s]+\/[^/\s]+$/, {
       message: "repository must be in owner/name form"
@@ -16533,6 +16534,11 @@ var init_github_sync = __esm({
     GithubSyncBindingListResponseSchema = external_exports.object({
       bindings: external_exports.array(GithubSyncBindingSchema)
     });
+    GithubSyncTriggerArtifactSchema = external_exports.object({
+      type: external_exports.string().trim().min(1),
+      externalId: external_exports.string().trim().min(1),
+      payload: JsonValueSchema.optional()
+    }).strict();
     GithubSyncWorkflowInputSchema = external_exports.discriminatedUnion("kind", [
       external_exports.object({
         kind: external_exports.literal("pull_request"),
@@ -16548,7 +16554,8 @@ var init_github_sync = __esm({
         pullRequestNumber: external_exports.number().int().positive(),
         headSha: external_exports.string().trim().min(1),
         baseSha: external_exports.string().trim().min(1).optional(),
-        baseRef: GithubSyncProductionBranchSchema
+        baseRef: GithubSyncProductionBranchSchema,
+        triggerArtifact: GithubSyncTriggerArtifactSchema.optional()
       }),
       external_exports.object({
         kind: external_exports.literal("push"),
@@ -16564,7 +16571,8 @@ var init_github_sync = __esm({
         ref: external_exports.string().trim().min(1),
         branch: GithubSyncProductionBranchSchema,
         before: external_exports.string().trim().min(1).optional(),
-        after: external_exports.string().trim().min(1)
+        after: external_exports.string().trim().min(1),
+        triggerArtifact: GithubSyncTriggerArtifactSchema.optional()
       })
     ]);
     GithubSyncWorkflowResultSchema = external_exports.discriminatedUnion("status", [
@@ -17147,6 +17155,84 @@ var init_trigger_router = __esm({
 });
 
 // ../../packages/schemas/src/agents.ts
+function refineNoPayloadPrefixedTemplateTokens(value, context) {
+  if (value === void 0) {
+    return;
+  }
+  const offending = new Set(
+    [...value.matchAll(PAYLOAD_PREFIXED_TEMPLATE_TOKEN)].map(
+      (match) => match[0]
+    )
+  );
+  if (offending.size > 0) {
+    context.addIssue({
+      code: external_exports.ZodIssueCode.custom,
+      message: `Template renders against the event payload; drop the "payload." prefix (use "{{github.\u2026}}", not "{{payload.github.\u2026}}"). Offending tokens: ${[...offending].join(", ")}`
+    });
+  }
+}
+function templateField(guard) {
+  const field = external_exports.string().trim().min(1).max(2e4).optional();
+  return guard === "authoring" ? field.superRefine(refineNoPayloadPrefixedTemplateTokens) : field;
+}
+function triggerSharedFields(guard) {
+  return {
+    message: templateField(guard),
+    checks: TriggerChecksField,
+    routing: TriggerRoutingSchema
+  };
+}
+function triggerBaseSchema(guard) {
+  return external_exports.object({
+    event: TriggerEventSchema,
+    ...triggerSharedFields(guard),
+    ...TriggerEventSourceFields
+  }).strict().superRefine((trigger, context) => {
+    validateTriggerChecks(trigger, context, [trigger.event]);
+  });
+}
+function triggerDefinitionBaseSchema(guard) {
+  return external_exports.object({
+    event: TriggerEventSchema.optional(),
+    events: TriggerEventsSchema.optional(),
+    ...triggerSharedFields(guard),
+    ...TriggerEventSourceFields
+  }).strict().superRefine((trigger, context) => {
+    if (trigger.event && trigger.events) {
+      context.addIssue({
+        code: external_exports.ZodIssueCode.custom,
+        path: ["events"],
+        message: "Use either event or events, not both"
+      });
+    }
+    if (!trigger.event && !trigger.events) {
+      context.addIssue({
+        code: external_exports.ZodIssueCode.custom,
+        path: ["event"],
+        message: "Trigger requires event or events"
+      });
+    }
+    validateTriggerChecks(
+      trigger,
+      context,
+      trigger.event ? [trigger.event] : trigger.events ?? []
+    );
+  });
+}
+function heartbeatTriggerBaseSchema(guard) {
+  return external_exports.object({
+    kind: external_exports.literal("heartbeat"),
+    event: external_exports.never().optional(),
+    connection: external_exports.never().optional(),
+    endpoint: external_exports.never().optional(),
+    auth: external_exports.never().optional(),
+    cron: external_exports.string().trim().min(1).max(512),
+    timezone: external_exports.string().trim().min(1).max(128).default("UTC"),
+    ...triggerSharedFields(guard)
+  }).strict().superRefine((trigger, context) => {
+    validateTriggerChecks(trigger, context, ["heartbeat"]);
+  });
+}
 function avatarAssetDimensions(bytes) {
   return pngDimensions(bytes) ?? jpegDimensions(bytes);
 }
@@ -17363,7 +17449,7 @@ function isChatMessageEvent(trigger) {
 function hasFilterValue(trigger, path2, expected) {
   return trigger.where?.[path2] === expected;
 }
-var RESOURCE_KIND_AGENT, AGENT_HARNESSES, TriggerFilterScalarSchema, TriggerFilterPathSchema, TriggerFilterClauseSchema, TriggerFilterSchema, TriggerCheckTimeoutSchema, TriggerEventSchema, TriggerEventsSchema, TriggerSharedFields, TriggerEventSourceFields, TriggerBaseSchema, TriggerDefinitionBaseSchema, TriggerSchema, ApplyTriggerSchema, HeartbeatTriggerBaseSchema, HeartbeatTriggerSchema, ApplyHeartbeatTriggerSchema, TriggerDefinitionSchema, ApplyTriggerDefinitionSchema, TriggersSchema, ApplyTriggersSchema, AVATAR_ASSET_EXTENSIONS, MAX_AVATAR_ASSET_BYTES, MIN_AVATAR_ASSET_DIMENSION_PX, MAX_AVATAR_ASSET_DIMENSION_PX, PNG_SIGNATURE, AGENT_IDENTITY_DESCRIPTION_MAX_LENGTH, SHA256_HEX_PATTERN, AgentIdentitySchema, AgentSpecFieldsSchema, AgentSpecSchema, AgentApplySpecSchema, AgentStatusSchema, AgentResourceSchema, AgentApplyRequestSchema, ApplyTriggerReceiptSchema, AgentApplyResponseSchema, AGENT_TELEGRAM_IDENTITY_STATUSES, AgentTelegramIdentityStatusSchema, AgentPresenceIdentitySchema, AgentPresenceResponseSchema, AgentPresenceConnectRequestSchema, AgentPresenceConnectPendingSchema, AgentPresenceConnectResponseSchema, AgentPresenceIconRequestSchema, AgentPresenceIconResponseSchema, AgentPresenceCompleteResponseSchema;
+var RESOURCE_KIND_AGENT, AGENT_HARNESSES, TriggerFilterScalarSchema, TriggerFilterPathSchema, TriggerFilterClauseSchema, TriggerFilterSchema, TriggerCheckTimeoutSchema, TriggerEventSchema, TriggerEventsSchema, PAYLOAD_PREFIXED_TEMPLATE_TOKEN, TriggerChecksField, TriggerEventSourceFields, TriggerSchema, ApplyTriggerSchema, HeartbeatTriggerSchema, ApplyHeartbeatTriggerSchema, TriggerDefinitionSchema, ApplyTriggerDefinitionSchema, TriggersSchema, ApplyTriggersSchema, AVATAR_ASSET_EXTENSIONS, MAX_AVATAR_ASSET_BYTES, MIN_AVATAR_ASSET_DIMENSION_PX, MAX_AVATAR_ASSET_DIMENSION_PX, PNG_SIGNATURE, AGENT_IDENTITY_DESCRIPTION_MAX_LENGTH, SHA256_HEX_PATTERN, AgentIdentitySchema, AgentSpecFieldsSchema, AgentSpecSchema, AgentApplySpecSchema, AgentStatusSchema, AgentResourceSchema, AgentApplyRequestSchema, ApplyTriggerReceiptSchema, AgentApplyResponseSchema, AGENT_TELEGRAM_IDENTITY_STATUSES, AgentTelegramIdentityStatusSchema, AgentPresenceIdentitySchema, AgentPresenceResponseSchema, AgentPresenceConnectRequestSchema, AgentPresenceConnectPendingSchema, AgentPresenceConnectResponseSchema, AgentPresenceIconRequestSchema, AgentPresenceIconResponseSchema, AgentPresenceCompleteResponseSchema;
 var init_agents = __esm({
   "../../packages/schemas/src/agents.ts"() {
     "use strict";
@@ -17427,29 +17513,26 @@ var init_agents = __esm({
         seen.add(event);
       }
     });
-    TriggerSharedFields = {
-      message: external_exports.string().trim().min(1).max(2e4).optional(),
-      checks: external_exports.array(
-        external_exports.object({
-          name: ResourceNameSchema,
-          displayName: external_exports.string().trim().min(1).max(256),
-          description: external_exports.string().trim().min(1).max(65535),
-          instructions: external_exports.string().trim().min(1).max(2e4).optional(),
-          timeout: TriggerCheckTimeoutSchema.optional(),
-          beginTimeout: TriggerCheckTimeoutSchema.optional(),
-          completeTimeout: TriggerCheckTimeoutSchema.optional()
-        }).strict().superRefine((check2, context) => {
-          if (check2.timeout && check2.beginTimeout) {
-            context.addIssue({
-              code: external_exports.ZodIssueCode.custom,
-              path: ["beginTimeout"],
-              message: "Use either timeout or beginTimeout for the creation-to-begin timeout, not both"
-            });
-          }
-        })
-      ).optional(),
-      routing: TriggerRoutingSchema
-    };
+    PAYLOAD_PREFIXED_TEMPLATE_TOKEN = /\{\{\s*(payload(?:\.[A-Za-z0-9_.-]+)?)\s*\}\}/g;
+    TriggerChecksField = external_exports.array(
+      external_exports.object({
+        name: ResourceNameSchema,
+        displayName: external_exports.string().trim().min(1).max(256),
+        description: external_exports.string().trim().min(1).max(65535),
+        instructions: external_exports.string().trim().min(1).max(2e4).optional(),
+        timeout: TriggerCheckTimeoutSchema.optional(),
+        beginTimeout: TriggerCheckTimeoutSchema.optional(),
+        completeTimeout: TriggerCheckTimeoutSchema.optional()
+      }).strict().superRefine((check2, context) => {
+        if (check2.timeout && check2.beginTimeout) {
+          context.addIssue({
+            code: external_exports.ZodIssueCode.custom,
+            path: ["beginTimeout"],
+            message: "Use either timeout or beginTimeout for the creation-to-begin timeout, not both"
+          });
+        }
+      })
+    ).optional();
     TriggerEventSourceFields = {
       connection: ConnectionNameSchema.optional(),
       endpoint: external_exports.string().trim().min(1).optional(),
@@ -17467,67 +17550,28 @@ var init_agents = __esm({
         })
       ]).optional()
     };
-    TriggerBaseSchema = external_exports.object({
-      event: TriggerEventSchema,
-      ...TriggerSharedFields,
-      ...TriggerEventSourceFields
-    }).strict().superRefine((trigger, context) => {
-      validateTriggerChecks(trigger, context, [trigger.event]);
-    });
-    TriggerDefinitionBaseSchema = external_exports.object({
-      event: TriggerEventSchema.optional(),
-      events: TriggerEventsSchema.optional(),
-      ...TriggerSharedFields,
-      ...TriggerEventSourceFields
-    }).strict().superRefine((trigger, context) => {
-      if (trigger.event && trigger.events) {
-        context.addIssue({
-          code: external_exports.ZodIssueCode.custom,
-          path: ["events"],
-          message: "Use either event or events, not both"
-        });
-      }
-      if (!trigger.event && !trigger.events) {
-        context.addIssue({
-          code: external_exports.ZodIssueCode.custom,
-          path: ["event"],
-          message: "Trigger requires event or events"
-        });
-      }
-      validateTriggerChecks(
-        trigger,
-        context,
-        trigger.event ? [trigger.event] : trigger.events ?? []
-      );
-    });
-    TriggerSchema = TriggerBaseSchema.extend({
+    TriggerSchema = triggerBaseSchema("stored").extend({
       where: external_exports.record(external_exports.string(), JsonValueSchema).default({})
     });
-    ApplyTriggerSchema = TriggerBaseSchema.extend({
+    ApplyTriggerSchema = triggerBaseSchema("authoring").extend({
       where: TriggerFilterSchema
     });
-    HeartbeatTriggerBaseSchema = external_exports.object({
-      kind: external_exports.literal("heartbeat"),
-      event: external_exports.never().optional(),
-      connection: external_exports.never().optional(),
-      endpoint: external_exports.never().optional(),
-      auth: external_exports.never().optional(),
-      cron: external_exports.string().trim().min(1).max(512),
-      timezone: external_exports.string().trim().min(1).max(128).default("UTC"),
-      ...TriggerSharedFields
-    }).strict().superRefine((trigger, context) => {
-      validateTriggerChecks(trigger, context, ["heartbeat"]);
-    });
-    HeartbeatTriggerSchema = HeartbeatTriggerBaseSchema.extend({
+    HeartbeatTriggerSchema = heartbeatTriggerBaseSchema(
+      "stored"
+    ).extend({
       where: external_exports.record(external_exports.string(), JsonValueSchema).default({})
     });
-    ApplyHeartbeatTriggerSchema = HeartbeatTriggerBaseSchema.extend({
+    ApplyHeartbeatTriggerSchema = heartbeatTriggerBaseSchema(
+      "authoring"
+    ).extend({
       where: TriggerFilterSchema
     });
-    TriggerDefinitionSchema = TriggerDefinitionBaseSchema.extend({
+    TriggerDefinitionSchema = triggerDefinitionBaseSchema("stored").extend({
       where: external_exports.record(external_exports.string(), JsonValueSchema).default({})
     });
-    ApplyTriggerDefinitionSchema = TriggerDefinitionBaseSchema.extend({
+    ApplyTriggerDefinitionSchema = triggerDefinitionBaseSchema(
+      "authoring"
+    ).extend({
       where: TriggerFilterSchema
     });
     TriggersSchema = external_exports.array(external_exports.union([TriggerDefinitionSchema, HeartbeatTriggerSchema])).transform(expandTriggerDefinitions).superRefine(validateAttributedRunsTriggerPairing);
@@ -17565,7 +17609,7 @@ var init_agents = __esm({
       systemPrompt: external_exports.string().trim().min(1).max(1e5).optional(),
       environment: ResourceNameSchema.optional(),
       identity: external_exports.union([ResourceNameSchema, AgentIdentitySchema]).optional(),
-      initialPrompt: external_exports.string().trim().min(1).max(2e4).optional(),
+      initialPrompt: templateField("stored"),
       env: SecretEnvSchema.default({}),
       mounts: external_exports.array(AgentMountSchema).default([]),
       triggers: TriggersSchema.default([]),
@@ -17576,6 +17620,7 @@ var init_agents = __esm({
       validateRunnableConfig
     );
     AgentApplySpecSchema = AgentSpecFieldsSchema.extend({
+      initialPrompt: templateField("authoring"),
       triggers: ApplyTriggersSchema.default([])
     }).superRefine(validateRunnableConfig);
     AgentStatusSchema = external_exports.object({
@@ -17888,7 +17933,7 @@ var init_project_service_accounts = __esm({
 function projectApplyBundleStorageKey(sha256) {
   return `project-apply-bundles/${sha256}.json`;
 }
-var EnvironmentApplyDocumentSchema, IdentityApplyDocumentSchema, AgentApplyDocumentSchema, ProjectApplyResourceSchema, PROJECT_RESOURCE_APPLY_ORDER, PROJECT_RESOURCE_KINDS, PROJECT_APPLY_RESOURCE_KINDS, PROJECT_APPLY_BUNDLE_VERSION, MAX_PROJECT_APPLY_BUNDLE_BYTES, PROJECT_APPLY_BUNDLE_CONTENT_TYPE, ProjectDeleteResourceBaseSchema, ProjectDeleteResourceSchema, AVATAR_ASSET_CONTENT_TYPES, MAX_AVATAR_ASSET_BASE64_LENGTH, ProjectApplyAssetSchema, ProjectApplyAssetsSchema, AvatarAssetUploadResponseSchema, ApplyBundlePathSchema, ProjectApplyBundleFileSchema, ProjectApplyBundleSchema, ProjectApplyBundleRefSchema, ProjectApplyBundleUploadRequestSchema, ProjectApplyBundleUploadResponseSchema, ProjectApplyBundleDirectoryEntrypointSchema, ProjectApplyBundleFileEntrypointSchema, ProjectApplyBundleEntrypointSchema, ProjectApplySourceSchema, ProjectApplySourceRequestSchema, ProjectApplyRequestSchema, ProjectApplySystemConfigSchema, ProjectAppliedResourceSchema, ProjectApplyDiagnosticSchema, ProjectApplyResponsePrunedSchema, ProjectApplyPlanDiffSchema, ProjectApplyResponseSchema, ProjectResourceApplyResultSchema, ProjectResourceApplyAuditActionSchema, ProjectResourceApplyOperationIdSchema, ProjectResourceApplyWorkflowErrorSchema, ProjectResourceApplyWorkflowInputSchema, ProjectResourceApplyWorkflowResultSchema;
+var EnvironmentApplyDocumentSchema, IdentityApplyDocumentSchema, AgentApplyDocumentSchema, ProjectApplyResourceSchema, PROJECT_RESOURCE_APPLY_ORDER, PROJECT_RESOURCE_KINDS, PROJECT_APPLY_RESOURCE_KINDS, PROJECT_APPLY_BUNDLE_VERSION, MAX_PROJECT_APPLY_BUNDLE_BYTES, PROJECT_APPLY_BUNDLE_CONTENT_TYPE, ProjectDeleteResourceBaseSchema, ProjectDeleteResourceSchema, AVATAR_ASSET_CONTENT_TYPES, MAX_AVATAR_ASSET_BASE64_LENGTH, ProjectApplyAssetSchema, ProjectApplyAssetsSchema, AvatarAssetUploadResponseSchema, ApplyBundlePathSchema, ProjectApplyBundleFileSchema, ProjectApplyBundleSchema, ProjectApplyBundleRefSchema, ProjectApplyBundleUploadRequestSchema, ProjectApplyBundleUploadResponseSchema, ProjectApplyBundleDirectoryEntrypointSchema, ProjectApplyBundleFileEntrypointSchema, ProjectApplyBundleEntrypointSchema, ProjectApplySourceSchema, ProjectApplySourceRequestSchema, ProjectApplyRequestSchema, ProjectApplySystemConfigSchema, ProjectAppliedResourceSchema, ProjectApplyDiagnosticSchema, ProjectApplyResponsePrunedSchema, ProjectApplyPlanDiffSchema, ProjectApplyResponseSchema, ProjectResourceApplyResultSchema, ProjectResourceApplyAuditActionSchema, ProjectResourceApplyOperationIdSchema, ProjectResourceApplyTriggerArtifactSchema, ProjectResourceApplyWorkflowErrorSchema, ProjectResourceApplyWorkflowInputSchema, ProjectResourceApplyWorkflowResultSchema;
 var init_project_resources = __esm({
   "../../packages/schemas/src/project-resources.ts"() {
     "use strict";
@@ -17899,6 +17944,7 @@ var init_project_resources = __esm({
     init_environments();
     init_identities();
     init_ids();
+    init_primitives();
     init_resources();
     init_trigger_router();
     EnvironmentApplyDocumentSchema = resourceApplyDocumentSchema(
@@ -18095,6 +18141,11 @@ var init_project_resources = __esm({
       "github_sync.apply"
     ]);
     ProjectResourceApplyOperationIdSchema = external_exports.string().trim().min(1).max(512);
+    ProjectResourceApplyTriggerArtifactSchema = external_exports.object({
+      type: external_exports.string().trim().min(1),
+      externalId: external_exports.string().trim().min(1),
+      payload: JsonValueSchema.optional()
+    }).strict();
     ProjectResourceApplyWorkflowErrorSchema = external_exports.object({
       name: external_exports.string().trim().min(1),
       message: external_exports.string().trim().min(1)
@@ -18106,7 +18157,8 @@ var init_project_resources = __esm({
       organizationId: OrganizationIdSchema,
       projectId: ProjectIdSchema.nullable().optional(),
       actor: AuthActorSchema,
-      auditAction: ProjectResourceApplyAuditActionSchema
+      auditAction: ProjectResourceApplyAuditActionSchema,
+      triggerArtifact: ProjectResourceApplyTriggerArtifactSchema.optional()
     }).superRefine((input, context) => {
       if ((input.request ? 1 : 0) + (input.sourceRequest ? 1 : 0) !== 1) {
         context.addIssue({
@@ -18502,7 +18554,7 @@ var init_session_introspection = __esm({
 });
 
 // ../../packages/schemas/src/session-commands.ts
-var SESSION_COMMAND_KINDS, SESSION_DISPATCH_COMMAND_KINDS, SESSION_PERSISTED_COMMAND_KINDS, SESSION_LIFECYCLE_COMMAND_KINDS, SESSION_COMMAND_STATUSES, SESSION_DISPATCH_COMMAND_STATUSES, SessionCommandKindSchema, SessionPersistedCommandKindSchema, SessionDispatchCommandKindSchema, RunLifecycleCommandKindSchema, SessionCommandStatusSchema, SessionDispatchCommandStatusSchema, SessionCommandSenderSchema, RunMessageCommandPayloadSchema, RunAnswerCommandPayloadSchema, RunLifecycleCommandPayloadSchema, SessionCommandPayloadSchema, CreateRunMessageCommandRequestSchema, CreateRunAnswerCommandRequestSchema, CreateRunLifecycleCommandRequestSchema, CreateSessionCommandRequestSchema, RunResolutionPolicySchema, AgentAddressedCommandTargetSchema, SessionCommandRecordBaseSchema, RunStartCommandPayloadSchema, RunStartWithMessageCommandPayloadSchema, SessionPersistedCommandPayloadSchema, SessionCommandRecordSchema, SessionDispatchMessageCommandPayloadSchema, SessionDispatchAnswerCommandPayloadSchema, SessionDispatchStopCommandPayloadSchema, SessionDispatchCommandPayloadSchema, SessionDispatchCommandRecordBaseSchema, SessionDispatchCommandRecordSchema;
+var SESSION_COMMAND_KINDS, SESSION_DISPATCH_COMMAND_KINDS, SESSION_PERSISTED_COMMAND_KINDS, SESSION_LIFECYCLE_COMMAND_KINDS, SESSION_COMMAND_STATUSES, SESSION_DISPATCH_COMMAND_STATUSES, SessionCommandKindSchema, SessionPersistedCommandKindSchema, SessionDispatchCommandKindSchema, RunLifecycleCommandKindSchema, SessionCommandStatusSchema, SessionDispatchCommandStatusSchema, SessionCommandSenderSchema, MESSAGE_DELIVERY_MODES, MessageDeliveryModeSchema, TRIGGER_INJECTION_MODALITIES, TriggerInjectionModalitySchema, RunMessageCommandPayloadSchema, RunAnswerCommandPayloadSchema, RunLifecycleCommandPayloadSchema, SessionCommandPayloadSchema, CreateRunMessageCommandRequestSchema, CreateRunAnswerCommandRequestSchema, CreateRunLifecycleCommandRequestSchema, CreateSessionCommandRequestSchema, RunResolutionPolicySchema, AgentAddressedCommandTargetSchema, SessionCommandRecordBaseSchema, RunStartCommandPayloadSchema, RunStartWithMessageCommandPayloadSchema, SessionPersistedCommandPayloadSchema, SessionCommandRecordSchema, SessionDispatchMessageCommandPayloadSchema, SessionDispatchAnswerCommandPayloadSchema, SessionDispatchStopCommandPayloadSchema, SessionDispatchCommandPayloadSchema, SessionDispatchCommandRecordBaseSchema, SessionDispatchCommandRecordSchema;
 var init_session_commands = __esm({
   "../../packages/schemas/src/session-commands.ts"() {
     "use strict";
@@ -18584,8 +18636,27 @@ var init_session_commands = __esm({
         type: external_exports.literal("system")
       })
     ]);
+    MESSAGE_DELIVERY_MODES = ["interrupt", "deferred"];
+    MessageDeliveryModeSchema = external_exports.enum(MESSAGE_DELIVERY_MODES);
+    TRIGGER_INJECTION_MODALITIES = [
+      "chat",
+      "githubCheck",
+      "githubCheckAction",
+      "githubPullRequest",
+      "other"
+    ];
+    TriggerInjectionModalitySchema = external_exports.enum(
+      TRIGGER_INJECTION_MODALITIES
+    );
     RunMessageCommandPayloadSchema = external_exports.object({
       message: external_exports.string().trim().min(1),
+      // Optional so existing payloads and direct operator/agent messages stay
+      // valid without it; trigger routing sets "deferred" for GitHub check
+      // events. An absent mode is treated as "interrupt" at the delivery
+      // boundary (commandDeliveryPayload / the runtime handler), so the default
+      // lives where the value is consumed rather than as a required field every
+      // call site must construct.
+      deliveryMode: MessageDeliveryModeSchema.optional(),
       metadata: JsonValueSchema.optional()
     }).strict();
     RunAnswerCommandPayloadSchema = external_exports.object({
@@ -21194,6 +21265,7 @@ function renderOAuthLoopbackPage(input) {
   ).join("");
   const hasDetails = detailRows.length > 0;
   const statusLabel = input.status === "success" ? "Authorization received" : "Authorization failed";
+  const badge = input.eyebrow ?? statusLabel;
   return `<!doctype html>
 <html lang="en">
   <head>
@@ -21202,151 +21274,251 @@ function renderOAuthLoopbackPage(input) {
     <title>${escapeHtml(input.title)} | Auto</title>
     <style>
       :root {
-        color-scheme: light dark;
-        font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
-        background: #f6f7f2;
-        color: #171814;
+        color-scheme: light;
+        --ease-out-strong: cubic-bezier(0.23, 1, 0.32, 1);
+        --canvas: #f9f9f6;
+        --ink: #262323;
+        --ink-80: rgba(38, 35, 35, 0.8);
+        --ink-70: rgba(38, 35, 35, 0.7);
+        --ink-43: rgba(38, 35, 35, 0.43);
+        --surface: #ffffff;
+        --surface-muted: #f8f8f7;
+        --hairline: #ebebeb;
+        --hairline-strong: #dedede;
+        --text-muted: #656362;
+        --danger: #b42318;
+        --danger-border: rgba(180, 35, 24, 0.3);
+        --danger-surface: rgba(180, 35, 24, 0.05);
+        --success: #297a3a;
+        --success-border: rgba(41, 122, 58, 0.3);
+        --radius-panel: 7px;
+        --radius-pill: 27px;
+        --font-sans: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+        --font-mono: ui-monospace, "SFMono-Regular", Consolas, "Liberation Mono", monospace;
+        background: var(--canvas);
+        color: var(--ink);
+        font-family: var(--font-sans);
       }
       * {
         box-sizing: border-box;
       }
       body {
         min-height: 100vh;
+        min-height: 100dvh;
         margin: 0;
-        display: grid;
-        place-items: center;
-        padding: 32px;
-        background:
-          linear-gradient(135deg, rgba(35, 108, 96, 0.18), transparent 34%),
-          linear-gradient(315deg, rgba(194, 90, 62, 0.16), transparent 38%),
-          #f6f7f2;
-      }
-      main {
-        width: min(680px, 100%);
-        border: 1px solid rgba(23, 24, 20, 0.12);
-        border-radius: 8px;
-        background: rgba(255, 255, 252, 0.88);
-        box-shadow: 0 24px 70px rgba(23, 24, 20, 0.14);
-        padding: 32px;
-      }
-      .mark {
+        background: var(--canvas);
+        color: var(--ink);
+        font-family: var(--font-sans);
+      }
+      .page {
+        min-height: 100vh;
+        min-height: 100dvh;
+        padding: 118px 28px 128px;
+      }
+      .content {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        width: min(560px, 100%);
+        margin: 0 auto;
+        animation: riseIn 600ms var(--ease-out-strong) backwards;
+      }
+      .header {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 24px;
+        width: 100%;
+        margin-bottom: 30px;
+      }
+      .logoLockup {
         display: inline-flex;
         align-items: center;
-        gap: 10px;
-        margin-bottom: 28px;
-        color: #4d554b;
-        font-size: 13px;
-        font-weight: 700;
+        gap: 4px;
+        color: var(--ink);
+        text-decoration: none;
+      }
+      .logoMark {
+        display: block;
+        width: 54px;
+        height: 54px;
+        transform: translateY(3px);
+      }
+      .wordmark {
+        color: var(--ink);
+        font: 500 50px / 1 var(--font-mono);
         letter-spacing: 0;
-        text-transform: uppercase;
+        transform: translateY(-2.4px);
       }
-      .dot {
-        width: 12px;
-        height: 12px;
-        border-radius: 999px;
-        background: ${input.status === "success" ? "#22863a" : "#b42318"};
-        box-shadow: 0 0 0 6px ${input.status === "success" ? "rgba(34, 134, 58, 0.14)" : "rgba(180, 35, 24, 0.14)"};
+      .heading {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        margin-bottom: 22px;
       }
-      h1 {
-        margin: 0;
-        max-width: 12ch;
-        font-size: 44px;
-        line-height: 1;
+      .badge {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        height: 22px;
+        padding: 0 12px;
+        border: 0.5px solid var(--ink-43);
+        border-radius: var(--radius-pill);
+        background: linear-gradient(
+          to top,
+          var(--surface-muted),
+          var(--surface) 93.3%
+        );
+        color: var(--ink-43);
+        font: 400 12px / 1 var(--font-sans);
         letter-spacing: 0;
       }
-      p {
-        margin: 18px 0 0;
-        max-width: 58ch;
-        color: #4d554b;
-        font-size: 16px;
-        line-height: 1.55;
+      h1 {
+        margin: 16px 0 0;
+        color: var(--ink-80);
+        font: 400 29px / 1.2 var(--font-sans);
+        letter-spacing: 0;
+        text-wrap: balance;
+      }
+      .body {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 20px;
+        width: 100%;
+      }
+      .feedback {
+        display: flex;
+        align-items: flex-start;
+        gap: 10px;
+        width: 100%;
+        margin: 0;
+        padding: 12px 14px;
+        border: 1px solid var(--hairline-strong);
+        border-radius: var(--radius-panel);
+        background: var(--surface);
+        color: var(--ink-70);
+        font: 400 15px / 22px var(--font-sans);
+      }
+      .feedbackIcon {
+        display: flex;
+        flex-shrink: 0;
+        margin-top: 3px;
+        color: var(--ink-43);
+      }
+      .feedback[data-status="success"] {
+        border-color: var(--success-border);
+        color: var(--success);
+      }
+      .feedback[data-status="failure"] {
+        border-color: var(--danger-border);
+        background: var(--danger-surface);
+        color: var(--danger);
       }
       dl {
-        display: grid;
-        gap: 0;
-        margin: 28px 0 0;
-        border-block: 1px solid rgba(23, 24, 20, 0.13);
+        width: 100%;
+        margin: 4px 0 0;
+        border-top: 1px solid var(--hairline);
+        border-bottom: 1px solid var(--surface);
       }
       .detail {
         display: grid;
-        grid-template-columns: minmax(118px, 0.42fr) 1fr;
+        grid-template-columns: minmax(120px, 0.42fr) minmax(0, 1fr);
         gap: 18px;
-        padding: 14px 0;
-        border-bottom: 1px solid rgba(23, 24, 20, 0.09);
-      }
-      .detail:last-child {
-        border-bottom: 0;
+        padding: 12px 0;
+        border-top: 1px solid var(--surface);
+        border-bottom: 1px solid var(--hairline);
       }
       dt {
-        color: #697066;
-        font-size: 13px;
+        color: var(--text-muted);
+        font: 400 13px / 19px var(--font-sans);
       }
       dd {
         margin: 0;
         min-width: 0;
         overflow-wrap: anywhere;
-        font-weight: 700;
+        color: var(--ink-80);
+        font: 500 14px / 19px var(--font-sans);
       }
       .footer {
-        margin-top: 28px;
-        color: #697066;
-        font-size: 13px;
+        max-width: 58ch;
+        margin: 0;
+        color: var(--text-muted);
+        font: 400 13px / 19px var(--font-sans);
       }
-      @media (max-width: 560px) {
-        body {
-          padding: 18px;
-        }
-        main {
-          padding: 24px;
-        }
-        h1 {
-          max-width: none;
-          font-size: 34px;
-        }
-        .detail {
-          grid-template-columns: 1fr;
-          gap: 4px;
+      @keyframes riseIn {
+        from {
+          opacity: 0;
+          transform: translateY(12px);
         }
       }
-      @media (prefers-color-scheme: dark) {
-        :root {
-          background: #10120f;
-          color: #f2f4ec;
+      @media (prefers-reduced-motion: reduce) {
+        .content {
+          animation-name: fadeOnly;
+          animation-duration: 300ms;
+          animation-timing-function: ease;
         }
-        body {
-          background:
-            linear-gradient(135deg, rgba(70, 165, 148, 0.2), transparent 34%),
-            linear-gradient(315deg, rgba(222, 116, 82, 0.16), transparent 38%),
-            #10120f;
+      }
+      @keyframes fadeOnly {
+        from {
+          opacity: 0;
         }
-        main {
-          border-color: rgba(242, 244, 236, 0.13);
-          background: rgba(24, 27, 22, 0.9);
-          box-shadow: 0 24px 70px rgba(0, 0, 0, 0.4);
+      }
+      @media (max-width: 640px) {
+        .page {
+          padding: 78px 24px 96px;
         }
-        p, dt, .mark, .footer {
-          color: #aeb6a8;
+        .header {
+          margin-bottom: 28px;
         }
-        dl {
-          border-color: rgba(242, 244, 236, 0.14);
+        h1 {
+          font-size: 26px;
         }
         .detail {
-          border-bottom-color: rgba(242, 244, 236, 0.09);
+          grid-template-columns: 1fr;
+          gap: 4px;
         }
       }
     </style>
   </head>
   <body>
-    <main>
-      <div class="mark"><span class="dot"></span>${escapeHtml(input.eyebrow ?? statusLabel)}</div>
-      <h1>${escapeHtml(input.title)}</h1>
-      <p>${escapeHtml(input.message)}</p>
-      ${hasDetails ? `<dl>${detailRows}</dl>` : ""}
-      <div class="footer">You can close this window and return to Auto.</div>
-    </main>
+    <div class="page">
+      <main class="content">
+        <header class="header">
+          <div class="logoLockup" aria-label="Auto">
+            ${AUTO_LOGO_SVG}
+            <span class="wordmark">auto</span>
+          </div>
+        </header>
+        <div class="heading">
+          <span class="badge">${escapeHtml(badge)}</span>
+          <h1>${escapeHtml(input.title)}</h1>
+        </div>
+        <div class="body">
+          <p class="feedback" data-status="${input.status}">
+            <span class="feedbackIcon">${renderStatusIcon(input.status)}</span>
+            <span>${escapeHtml(input.message)}</span>
+          </p>
+          ${hasDetails ? `<dl>${detailRows}</dl>` : ""}
+          <p class="footer">You can close this window and return to Auto.</p>
+        </div>
+      </main>
+    </div>
   </body>
 </html>`;
 }
+function renderStatusIcon(status) {
+  if (status === "success") {
+    return `<svg width="16" height="16" viewBox="0 0 20 20" fill="none" aria-hidden="true">
+<path d="M4.167 10.833 8.125 14.79l7.708-9.583" stroke="currentColor" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>`;
+  }
+  return `<svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true">
+<circle cx="8" cy="8" r="6.75" stroke="currentColor" stroke-width="1.25"/>
+<path d="M8 7.25v3.5" stroke="currentColor" stroke-width="1.25" stroke-linecap="round"/>
+<circle cx="8" cy="5.125" r="0.875" fill="currentColor"/>
+</svg>`;
+}
 function resolveHtml(html, result) {
   return typeof html === "function" ? html(result) : html;
 }
@@ -21398,11 +21570,50 @@ async function listen(server, port) {
     server.listen(port, "127.0.0.1");
   });
 }
-var DEFAULT_CALLBACK_PORT;
+var DEFAULT_CALLBACK_PORT, AUTO_LOGO_SVG;
 var init_loopback = __esm({
   "src/lib/oauth/loopback.ts"() {
     "use strict";
     DEFAULT_CALLBACK_PORT = 4670;
+    AUTO_LOGO_SVG = `<svg class="logoMark" width="54" height="54" viewBox="0 0 54 54" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+<path d="M7.59195 13.5C7.12791 13.5063 6.75454 13.8839 6.75666 14.348V39.6605C6.76299 40.1182 7.13213 40.4895 7.59195 40.4937H46.409H46.4069C46.8709 40.4958 47.2485 40.1225 47.2548 39.6605V14.348C47.2548 14.1223 47.1662 13.9071 47.008 13.7468C46.8477 13.5886 46.6326 13.5 46.4069 13.5L7.59195 13.5ZM20.2523 15.1812H21.9398V16.8687H23.6273V15.1812H27.0023V16.8687H28.6898V15.1812H33.7523V16.8687H35.4398V15.1812H45.5603V38.8125H32.0648V37.125H30.3773V38.8125H25.3148V37.125H23.6273V38.8125H21.9398V37.125H20.2523V38.8125H18.5648V37.125H20.2523V35.4375H18.5648V33.75H20.2523V32.0625H18.5648V30.375H20.2523V28.6875H18.5648V27H20.2523V25.3125H18.5648V23.625H20.2523V21.9375H18.5648V20.25H20.2523V18.5625H18.5648V16.8686H20.2523V15.1812Z" fill="#0D8CF3"/>
+<path d="M20.25 16.875H21.9375V18.5625H20.25V16.875Z" fill="#0D8CF3"/>
+<path d="M20.25 20.25H21.9375V21.9375H20.25V20.25Z" fill="#0D8CF3"/>
+<path d="M20.25 23.625H21.9375V25.3125H20.25V23.625Z" fill="#0D8CF3"/>
+<path d="M20.25 27H21.9375V28.6875H20.25V27Z" fill="#0D8CF3"/>
+<path d="M20.25 30.375H21.9375V32.0625H20.25V30.375Z" fill="#0D8CF3"/>
+<path d="M20.25 33.75H21.9375V35.4375H20.25V33.75Z" fill="#0D8CF3"/>
+<path d="M21.9375 21.9375H23.625V23.625H21.9375V21.9375Z" fill="#0D8CF3"/>
+<path d="M21.9375 28.6875H23.625V30.375H21.9375V28.6875Z" fill="#0D8CF3"/>
+<path d="M21.9375 35.4375H23.625V37.125H21.9375V35.4375Z" fill="#0D8CF3"/>
+<path d="M21.9375 18.5625H23.625V20.25H21.9375V18.5625Z" fill="#0D8CF3"/>
+<path d="M21.9375 25.3125H23.625V27H21.9375V25.3125Z" fill="#0D8CF3"/>
+<path d="M21.9375 32.0625H23.625V33.75H21.9375V32.0625Z" fill="#0D8CF3"/>
+<path d="M23.625 16.875H25.3125V18.5625H23.625V16.875Z" fill="#0D8CF3"/>
+<path d="M23.625 23.625H25.3125V25.3125H23.625V23.625Z" fill="#0D8CF3"/>
+<path d="M23.625 30.375H25.3125V32.0625H23.625V30.375Z" fill="#0D8CF3"/>
+<path d="M23.625 20.25H25.3125V21.9375H23.625V20.25Z" fill="#0D8CF3"/>
+<path d="M23.625 27H25.3125V28.6875H23.625V27Z" fill="#0D8CF3"/>
+<path d="M23.625 33.75H25.3125V35.4375H23.625V33.75Z" fill="#0D8CF3"/>
+<path d="M27 18.5625H28.6875V20.25H27V18.5625Z" fill="#0D8CF3"/>
+<path d="M27 21.9375H28.6875V23.625H27V21.9375Z" fill="#0D8CF3"/>
+<path d="M27 25.3125H28.6875V27H27V25.3125Z" fill="#0D8CF3"/>
+<path d="M27 28.6875H28.6875V30.375H27V28.6875Z" fill="#0D8CF3"/>
+<path d="M27 32.0625H28.6875V33.75H27V32.0625Z" fill="#0D8CF3"/>
+<path d="M27 35.4375H28.6875V37.125H27V35.4375Z" fill="#0D8CF3"/>
+<path d="M30.375 16.875H32.0625V18.5625H30.375V16.875Z" fill="#0D8CF3"/>
+<path d="M30.375 20.25H32.0625V21.9375H30.375V20.25Z" fill="#0D8CF3"/>
+<path d="M30.375 23.625H32.0625V25.3125H30.375V23.625Z" fill="#0D8CF3"/>
+<path d="M30.375 27H32.0625V28.6875H30.375V27Z" fill="#0D8CF3"/>
+<path d="M30.375 30.375H32.0625V32.0625H30.375V30.375Z" fill="#0D8CF3"/>
+<path d="M30.375 33.75H32.0625V35.4375H30.375V33.75Z" fill="#0D8CF3"/>
+<path d="M33.75 18.5625H35.4375V20.25H33.75V18.5625Z" fill="#0D8CF3"/>
+<path d="M33.75 21.9375H35.4375V23.625H33.75V21.9375Z" fill="#0D8CF3"/>
+<path d="M33.75 25.3125H35.4375V27H33.75V25.3125Z" fill="#0D8CF3"/>
+<path d="M33.75 28.6875H35.4375V30.375H33.75V28.6875Z" fill="#0D8CF3"/>
+<path d="M33.75 32.0625H35.4375V33.75H33.75V32.0625Z" fill="#0D8CF3"/>
+<path d="M33.75 35.4375H35.4375V37.125H33.75V35.4375Z" fill="#0D8CF3"/>
+</svg>`;
   }
 });
 
@@ -21412,7 +21623,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.187",
+      version: "0.1.196",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -23932,14 +24143,14 @@ async function login(input) {
     const callback = await createOAuthLoopbackCallback({
       successHtml: () => renderOAuthLoopbackPage({
         status: "success",
-        eyebrow: "Auto CLI",
+        eyebrow: "CLI login",
         title: "Login authorized",
         message: "Auto received the browser authorization. The CLI will finish signing you in from your terminal.",
         details: [{ label: "Server", value: serverUrl }]
       }),
       failureHtml: () => renderOAuthLoopbackPage({
         status: "failure",
-        eyebrow: "Auto CLI",
+        eyebrow: "CLI login",
         title: "Login failed",
         message: "The browser authorization did not complete. Return to your terminal to retry or inspect the error.",
         details: [{ label: "Server", value: serverUrl }]
@@ -31764,6 +31975,7 @@ function withClaudeStderrDiagnosticsPointer(error51, capturedStderr) {
 
 // src/commands/agent-bridge/harness/claude-code/session.ts
 var CLAUDE_AGENT_STARTUP_TIMEOUT_MS = 3e4;
+var CLAUDE_INTERRUPT_SETTLE_TIMEOUT_MS = 1e4;
 var CLAUDE_STARTUP_PROFILE_HOOK_EVENTS = [
   "Setup",
   "SessionStart",
@@ -31796,6 +32008,21 @@ var ClaudeAgentBridgeSessionImpl = class {
   activeTurnCount = 0;
   interruptInFlight = null;
   exitReported = false;
+  // Messages delivered in "deferred" mode while a turn is in flight. They are
+  // held here instead of injected mid-turn (which would reject a pending
+  // tool_use) and flushed once the turn ends and the session is idle.
+  deferredMessages = [];
+  // tool_use ids the assistant has emitted whose tool_result has not yet been
+  // observed. A non-empty set means a tool call is in flight, so an immediate
+  // interrupt would append the new user message after an unresolved
+  // stop_reason=tool_use — the invalid transcript that trips Claude Code's
+  // ede_diagnostic and auto-restarts the session (FRA-3049).
+  pendingToolUseIds = /* @__PURE__ */ new Set();
+  // Incremented on every turn-terminal `result`. An interrupt that aborts an
+  // in-flight tool call waits for this to advance before injecting, so the
+  // message lands only once the interrupted turn has settled its tool_use.
+  turnResultCount = 0;
+  turnSettlementWaiters = /* @__PURE__ */ new Set();
   constructor(input) {
     const optionsStartedAt = Date.now();
     this.input = input;
@@ -31838,13 +32065,17 @@ var ClaudeAgentBridgeSessionImpl = class {
       throw error51;
     }
   }
-  async sendMessage(message) {
+  async sendMessage(message, options) {
+    const mode = options?.mode ?? "interrupt";
+    if (mode === "deferred" && this.hasInterruptibleTurn()) {
+      this.deferredMessages.push(message);
+      this.input.writeOutput?.(
+        `agent_bridge_claude_message_deferred active_turn_count=${this.activeTurnCount}`
+      );
+      return;
+    }
     await this.interruptActiveTurnBeforeMessage();
-    this.inputQueue.push(claudeAgentUserMessage(message));
-    this.activeTurnCount += 1;
-    void this.ensureRunningQuery().catch((error51) => {
-      void this.input.onError(error51);
-    });
+    this.enqueueUserMessage(message);
   }
   close() {
     const previousState = this.state;
@@ -31853,6 +32084,14 @@ var ClaudeAgentBridgeSessionImpl = class {
     }
     this.state = { kind: "closed" };
     this.activeTurnCount = 0;
+    this.pendingToolUseIds.clear();
+    this.resolveTurnSettlement(false);
+    if (this.deferredMessages.length > 0) {
+      this.input.writeOutput?.(
+        `agent_bridge_claude_deferred_dropped count=${this.deferredMessages.length} reason=session_closed`
+      );
+      this.deferredMessages.length = 0;
+    }
     this.stderr.flush();
     this.inputQueue.close();
     if (previousState.kind === "started") {
@@ -31935,8 +32174,15 @@ var ClaudeAgentBridgeSessionImpl = class {
     void (async () => {
       try {
         for await (const message of query) {
+          this.trackToolUseLifecycle(message);
           if (isClaudeAgentTurnResult(message)) {
             this.activeTurnCount = Math.max(0, this.activeTurnCount - 1);
+            this.pendingToolUseIds.clear();
+            this.turnResultCount += 1;
+            this.resolveTurnSettlement(true);
+            if (this.activeTurnCount === 0) {
+              this.flushDeferredMessages();
+            }
           }
           const failure = probeClaudeAgentMessage(
             message,
@@ -31960,23 +32206,116 @@ var ClaudeAgentBridgeSessionImpl = class {
         }
       } finally {
         this.activeTurnCount = 0;
+        this.pendingToolUseIds.clear();
+        this.resolveTurnSettlement(false);
         this.state = { kind: "closed" };
         this.reportExit();
       }
     })();
   }
+  // Queue a user message as a fresh turn. Pushing before ensureRunningQuery()
+  // lets injection work while the SDK session is still starting; the queue
+  // drains once the query attaches. Startup failures surface through onError
+  // instead of failing injection.
+  enqueueUserMessage(message) {
+    this.inputQueue.push(claudeAgentUserMessage(message));
+    this.activeTurnCount += 1;
+    void this.ensureRunningQuery().catch((error51) => {
+      void this.input.onError(error51);
+    });
+  }
+  // A turn the SDK is actively running, so a new user message would either
+  // interrupt it or land mid-turn. Startup/idle states have nothing to disturb.
+  hasInterruptibleTurn() {
+    return this.activeTurnCount > 0 && this.state.kind === "running";
+  }
+  // True while the assistant has an emitted tool_use with no matching
+  // tool_result yet — the window where an immediate interrupt would strand an
+  // unresolved stop_reason=tool_use ahead of the injected user message.
+  hasInFlightToolUse() {
+    return this.pendingToolUseIds.size > 0;
+  }
+  // Track tool_use/tool_result pairs as they stream so hasInFlightToolUse()
+  // reflects the live transcript. tool_use opens a call; the matching
+  // tool_result closes it; the turn's terminal result clears any remainder.
+  trackToolUseLifecycle(message) {
+    for (const id of toolUseIds(message)) {
+      this.pendingToolUseIds.add(id);
+    }
+    for (const id of toolResultIds(message)) {
+      this.pendingToolUseIds.delete(id);
+    }
+  }
+  // Resolve once the interrupted turn emits its terminal `result` (turnResultCount
+  // advances past the pre-interrupt baseline), bounded so a tool that never
+  // returns after interrupt cannot wedge delivery. On timeout the caller falls
+  // back to immediate injection rather than hanging or dropping the message.
+  awaitTurnSettlement(baseline, startedAt) {
+    if (this.turnResultCount > baseline) {
+      return Promise.resolve();
+    }
+    return new Promise((resolve4) => {
+      let done = false;
+      const finish = (outcome) => {
+        if (done) {
+          return;
+        }
+        done = true;
+        clearTimeout(timer);
+        this.turnSettlementWaiters.delete(waiter);
+        this.input.writeOutput?.(
+          `agent_bridge_claude_interrupt_settle_${outcome} duration_ms=${Date.now() - startedAt}`
+        );
+        resolve4();
+      };
+      const waiter = (settled) => finish(settled ? "ready" : "aborted");
+      const timer = setTimeout(
+        () => finish("timeout"),
+        CLAUDE_INTERRUPT_SETTLE_TIMEOUT_MS
+      );
+      timer.unref?.();
+      this.turnSettlementWaiters.add(waiter);
+    });
+  }
+  resolveTurnSettlement(settled) {
+    if (this.turnSettlementWaiters.size === 0) {
+      return;
+    }
+    const waiters = [...this.turnSettlementWaiters];
+    this.turnSettlementWaiters.clear();
+    for (const waiter of waiters) {
+      waiter(settled);
+    }
+  }
+  flushDeferredMessages() {
+    if (this.deferredMessages.length === 0) {
+      return;
+    }
+    const pending = this.deferredMessages.splice(0);
+    this.input.writeOutput?.(
+      `agent_bridge_claude_deferred_flush count=${pending.length}`
+    );
+    for (const message of pending) {
+      this.enqueueUserMessage(message);
+    }
+  }
   async interruptActiveTurnBeforeMessage() {
-    if (this.activeTurnCount === 0 || this.state.kind !== "running") {
+    if (!this.hasInterruptibleTurn()) {
       return;
     }
     if (this.interruptInFlight) {
       await this.interruptInFlight;
       return;
     }
+    if (this.state.kind !== "running") {
+      return;
+    }
     const query = this.state.query;
+    const hadInFlightToolUse = this.hasInFlightToolUse();
+    const settlementBaseline = this.turnResultCount;
     const startedAt = Date.now();
     this.input.writeOutput?.(
-      `agent_bridge_claude_mid_turn_interrupt_started at=${new Date(startedAt).toISOString()}`
+      `agent_bridge_claude_mid_turn_interrupt_started at=${new Date(startedAt).toISOString()} in_flight_tool_use=${hadInFlightToolUse}`
     );
     const interruptPromise = (async () => {
       try {
@@ -31989,6 +32328,9 @@ var ClaudeAgentBridgeSessionImpl = class {
           `agent_bridge_claude_mid_turn_interrupt_failed duration_ms=${Date.now() - startedAt} error=${error51 instanceof Error ? error51.message : String(error51)}`
         );
       }
+      if (hadInFlightToolUse) {
+        await this.awaitTurnSettlement(settlementBaseline, startedAt);
+      }
     })();
     this.interruptInFlight = interruptPromise;
     try {
@@ -32146,6 +32488,30 @@ function claudeAgentUserMessage(message) {
 function isClaudeAgentTurnResult(message) {
   return message.type === "result";
 }
+function toolUseIds(message) {
+  if (message.type !== "assistant") {
+    return [];
+  }
+  return contentBlocks(message.message.content).flatMap(
+    (block) => block.type === "tool_use" && typeof block.id === "string" ? [block.id] : []
+  );
+}
+function toolResultIds(message) {
+  if (message.type !== "user") {
+    return [];
+  }
+  return contentBlocks(message.message.content).flatMap(
+    (block) => block.type === "tool_result" && typeof block.tool_use_id === "string" ? [block.tool_use_id] : []
+  );
+}
+function contentBlocks(content) {
+  if (!Array.isArray(content)) {
+    return [];
+  }
+  return content.filter(
+    (block) => typeof block === "object" && block !== null
+  );
+}
 
 // src/commands/agent-bridge/harness/claude-code/index.ts
 async function runAgentBridgeClaudeCode(options) {
@@ -32249,7 +32615,9 @@ var ClaudeCodeCommandHandler = class {
           }
         }
       });
-      await this.ensureAgentSession().sendMessage(message);
+      await this.ensureAgentSession().sendMessage(message, {
+        mode: deliveryMode(delivery)
+      });
     } catch (error51) {
       this.injectedCommands.delete(delivery.commandId);
       return commandAck({
@@ -32495,6 +32863,16 @@ function deliveryMessage(delivery) {
   }
   return null;
 }
+function deliveryMode(delivery) {
+  const payload = delivery.payload;
+  if (payload && typeof payload === "object" && "deliveryMode" in payload) {
+    const parsed = MessageDeliveryModeSchema.safeParse(payload.deliveryMode);
+    if (parsed.success) {
+      return parsed.data;
+    }
+  }
+  return "interrupt";
+}
 
 // src/commands/agent-bridge/entrypoint.ts
 async function runAgentBridgeProcess(input) {