agent-dealer 1.2.7 → 1.2.8

package/bundle/shared/dist/issues.d.ts

@@ -15,6 +15,49 @@ export declare const Issue: z.ZodObject<{
     title: z.ZodString;
     description: z.ZodNullable<z.ZodString>;
     acceptanceCriteria: z.ZodNullable<z.ZodString>;
+    /**
+     * NOT-306: compiled execution contract derived from the ticket description
+     * (canonical `##` headings). Derived data — the description stays the source
+     * of truth — null for legacy/contract-free issues. Optional so previously
+     * stored rows and existing fixtures parse unchanged.
+     */
+    executionContract: z.ZodOptional<z.ZodNullable<z.ZodObject<{
+        version: z.ZodLiteral<"v1">;
+        executionMode: z.ZodEnum<["feature", "bug fix", "refactor", "investigation", "split child"]>;
+        nonGoals: z.ZodArray<z.ZodString, "many">;
+        exitPredicate: z.ZodString;
+        onePrStoppingPoint: z.ZodString;
+        acceptanceCriteria: z.ZodArray<z.ZodObject<{
+            text: z.ZodString;
+            evidence: z.ZodNullable<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            text: string;
+            evidence: string | null;
+        }, {
+            text: string;
+            evidence: string | null;
+        }>, "many">;
+    }, "strip", z.ZodTypeAny, {
+        version: "v1";
+        executionMode: "feature" | "bug fix" | "refactor" | "investigation" | "split child";
+        nonGoals: string[];
+        exitPredicate: string;
+        onePrStoppingPoint: string;
+        acceptanceCriteria: {
+            text: string;
+            evidence: string | null;
+        }[];
+    }, {
+        version: "v1";
+        executionMode: "feature" | "bug fix" | "refactor" | "investigation" | "split child";
+        nonGoals: string[];
+        exitPredicate: string;
+        onePrStoppingPoint: string;
+        acceptanceCriteria: {
+            text: string;
+            evidence: string | null;
+        }[];
+    }>>>;
     /**
      * Portable GitHub identity (`github.com/owner/repo`) for new issues (NOT-149).
      * Legacy rows may still hold a local filesystem path until explicitly migrated —
@@ -52,13 +95,13 @@ export declare const Issue: z.ZodObject<{
     createdAt: string;
     updatedAt: string;
     repo: string;
+    acceptanceCriteria: string | null;
+    description: string | null;
     title: string;
     source: "manual" | "linear" | "agent";
     externalId: string | null;
     externalLabel: string | null;
     externalUrl: string | null;
-    description: string | null;
-    acceptanceCriteria: string | null;
     baseBranch: string;
     currentOwner: "reviewer" | "developer" | "human" | "system";
     currentIntent: string | null;
@@ -73,6 +116,17 @@ export declare const Issue: z.ZodObject<{
     prNumber: number | null;
     prUrl: string | null;
     autoMerge: boolean;
+    executionContract?: {
+        version: "v1";
+        executionMode: "feature" | "bug fix" | "refactor" | "investigation" | "split child";
+        nonGoals: string[];
+        exitPredicate: string;
+        onePrStoppingPoint: string;
+        acceptanceCriteria: {
+            text: string;
+            evidence: string | null;
+        }[];
+    } | null | undefined;
 }, {
     branch: string | null;
     status: "final_review" | "done" | "ready" | "developing" | "reviewing" | "repairing" | "needs_human" | "closed";
@@ -80,13 +134,13 @@ export declare const Issue: z.ZodObject<{
     createdAt: string;
     updatedAt: string;
     repo: string;
+    acceptanceCriteria: string | null;
+    description: string | null;
     title: string;
     source: "manual" | "linear" | "agent";
     externalId: string | null;
     externalLabel: string | null;
     externalUrl: string | null;
-    description: string | null;
-    acceptanceCriteria: string | null;
     baseBranch: string;
     currentOwner: "reviewer" | "developer" | "human" | "system";
     currentIntent: string | null;
@@ -101,6 +155,17 @@ export declare const Issue: z.ZodObject<{
     prNumber: number | null;
     prUrl: string | null;
     autoMerge: boolean;
+    executionContract?: {
+        version: "v1";
+        executionMode: "feature" | "bug fix" | "refactor" | "investigation" | "split child";
+        nonGoals: string[];
+        exitPredicate: string;
+        onePrStoppingPoint: string;
+        acceptanceCriteria: {
+            text: string;
+            evidence: string | null;
+        }[];
+    } | null | undefined;
 }>;
 export type Issue = z.infer<typeof Issue>;
 export declare const CreateIssueInput: z.ZodObject<{
@@ -137,22 +202,22 @@ export declare const CreateIssueInput: z.ZodObject<{
     maxInfraAttempts: number;
     autoMerge: boolean;
     enqueue: boolean;
+    acceptanceCriteria?: string | undefined;
+    description?: string | undefined;
     externalId?: string | undefined;
     externalLabel?: string | undefined;
     externalUrl?: string | undefined;
-    description?: string | undefined;
-    acceptanceCriteria?: string | undefined;
 }, {
     repo: string;
     title: string;
     developerAgentId: string;
     reviewerAgentId: string;
+    acceptanceCriteria?: string | undefined;
+    description?: string | undefined;
     source?: "manual" | "linear" | "agent" | undefined;
     externalId?: string | undefined;
     externalLabel?: string | undefined;
     externalUrl?: string | undefined;
-    description?: string | undefined;
-    acceptanceCriteria?: string | undefined;
     baseBranch?: string | undefined;
     maxReviewRounds?: number | undefined;
     maxInfraAttempts?: number | undefined;
@@ -176,9 +241,9 @@ export declare const UpdateIssueInput: z.ZodObject<{
     autoMerge: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     repo?: string | undefined;
-    title?: string | undefined;
-    description?: string | null | undefined;
     acceptanceCriteria?: string | null | undefined;
+    description?: string | null | undefined;
+    title?: string | undefined;
     baseBranch?: string | undefined;
     developerAgentId?: string | undefined;
     reviewerAgentId?: string | undefined;
@@ -187,9 +252,9 @@ export declare const UpdateIssueInput: z.ZodObject<{
     autoMerge?: boolean | undefined;
 }, {
     repo?: string | undefined;
-    title?: string | undefined;
-    description?: string | null | undefined;
     acceptanceCriteria?: string | null | undefined;
+    description?: string | null | undefined;
+    title?: string | undefined;
     baseBranch?: string | undefined;
     developerAgentId?: string | undefined;
     reviewerAgentId?: string | undefined;
@@ -239,6 +304,49 @@ export declare const CreateIssueResult: z.ZodObject<{
     title: z.ZodString;
     description: z.ZodNullable<z.ZodString>;
     acceptanceCriteria: z.ZodNullable<z.ZodString>;
+    /**
+     * NOT-306: compiled execution contract derived from the ticket description
+     * (canonical `##` headings). Derived data — the description stays the source
+     * of truth — null for legacy/contract-free issues. Optional so previously
+     * stored rows and existing fixtures parse unchanged.
+     */
+    executionContract: z.ZodOptional<z.ZodNullable<z.ZodObject<{
+        version: z.ZodLiteral<"v1">;
+        executionMode: z.ZodEnum<["feature", "bug fix", "refactor", "investigation", "split child"]>;
+        nonGoals: z.ZodArray<z.ZodString, "many">;
+        exitPredicate: z.ZodString;
+        onePrStoppingPoint: z.ZodString;
+        acceptanceCriteria: z.ZodArray<z.ZodObject<{
+            text: z.ZodString;
+            evidence: z.ZodNullable<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            text: string;
+            evidence: string | null;
+        }, {
+            text: string;
+            evidence: string | null;
+        }>, "many">;
+    }, "strip", z.ZodTypeAny, {
+        version: "v1";
+        executionMode: "feature" | "bug fix" | "refactor" | "investigation" | "split child";
+        nonGoals: string[];
+        exitPredicate: string;
+        onePrStoppingPoint: string;
+        acceptanceCriteria: {
+            text: string;
+            evidence: string | null;
+        }[];
+    }, {
+        version: "v1";
+        executionMode: "feature" | "bug fix" | "refactor" | "investigation" | "split child";
+        nonGoals: string[];
+        exitPredicate: string;
+        onePrStoppingPoint: string;
+        acceptanceCriteria: {
+            text: string;
+            evidence: string | null;
+        }[];
+    }>>>;
     /**
      * Portable GitHub identity (`github.com/owner/repo`) for new issues (NOT-149).
      * Legacy rows may still hold a local filesystem path until explicitly migrated —
@@ -286,13 +394,13 @@ export declare const CreateIssueResult: z.ZodObject<{
     createdAt: string;
     updatedAt: string;
     repo: string;
+    acceptanceCriteria: string | null;
+    description: string | null;
     title: string;
     source: "manual" | "linear" | "agent";
     externalId: string | null;
     externalLabel: string | null;
     externalUrl: string | null;
-    description: string | null;
-    acceptanceCriteria: string | null;
     baseBranch: string;
     currentOwner: "reviewer" | "developer" | "human" | "system";
     currentIntent: string | null;
@@ -310,6 +418,17 @@ export declare const CreateIssueResult: z.ZodObject<{
     created: boolean;
     queue: "enqueued" | "already_queued" | "not_queued";
     priorPasses: number;
+    executionContract?: {
+        version: "v1";
+        executionMode: "feature" | "bug fix" | "refactor" | "investigation" | "split child";
+        nonGoals: string[];
+        exitPredicate: string;
+        onePrStoppingPoint: string;
+        acceptanceCriteria: {
+            text: string;
+            evidence: string | null;
+        }[];
+    } | null | undefined;
 }, {
     branch: string | null;
     status: "final_review" | "done" | "ready" | "developing" | "reviewing" | "repairing" | "needs_human" | "closed";
@@ -317,13 +436,13 @@ export declare const CreateIssueResult: z.ZodObject<{
     createdAt: string;
     updatedAt: string;
     repo: string;
+    acceptanceCriteria: string | null;
+    description: string | null;
     title: string;
     source: "manual" | "linear" | "agent";
     externalId: string | null;
     externalLabel: string | null;
     externalUrl: string | null;
-    description: string | null;
-    acceptanceCriteria: string | null;
     baseBranch: string;
     currentOwner: "reviewer" | "developer" | "human" | "system";
     currentIntent: string | null;
@@ -341,6 +460,17 @@ export declare const CreateIssueResult: z.ZodObject<{
     created: boolean;
     queue: "enqueued" | "already_queued" | "not_queued";
     priorPasses: number;
+    executionContract?: {
+        version: "v1";
+        executionMode: "feature" | "bug fix" | "refactor" | "investigation" | "split child";
+        nonGoals: string[];
+        exitPredicate: string;
+        onePrStoppingPoint: string;
+        acceptanceCriteria: {
+            text: string;
+            evidence: string | null;
+        }[];
+    } | null | undefined;
 }>;
 export type CreateIssueResult = z.infer<typeof CreateIssueResult>;
 /** 409 body when a re-import collides with a live issue — mirrors the runs promote path. */

package/bundle/shared/dist/issues.js

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { GitHubRepoInput } from "./github-repo.js";
+import { ExecutionContractV1 } from "./execution-contract.js";
 export const IssueStatus = z.enum([
     "ready",
     "developing",
@@ -22,6 +23,13 @@ export const Issue = z.object({
     title: z.string(),
     description: z.string().nullable(),
     acceptanceCriteria: z.string().nullable(),
+    /**
+     * NOT-306: compiled execution contract derived from the ticket description
+     * (canonical `##` headings). Derived data — the description stays the source
+     * of truth — null for legacy/contract-free issues. Optional so previously
+     * stored rows and existing fixtures parse unchanged.
+     */
+    executionContract: ExecutionContractV1.nullable().optional(),
     /**
      * Portable GitHub identity (`github.com/owner/repo`) for new issues (NOT-149).
      * Legacy rows may still hold a local filesystem path until explicitly migrated —

package/bundle/shared/dist/issues.test.js

@@ -27,6 +27,7 @@ test("Issue schema parses a well-formed issue", () => {
         title: "Fix login bug",
         description: null,
         acceptanceCriteria: null,
+        executionContract: null,
         repo: "acme/app",
         baseBranch: "main",
         status: "ready",

package/bundle/shared/dist/outbound-draft.d.ts

@@ -5,11 +5,11 @@ export declare const OutboundDraftSummary: z.ZodObject<{
     target: z.ZodString;
     body: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    target: string;
     body: string;
-}, {
     target: string;
+}, {
     body: string;
+    target: string;
 }>;
 export type OutboundDraftSummary = z.infer<typeof OutboundDraftSummary>;
 export declare const OutboundToolCall: z.ZodObject<{
@@ -33,11 +33,11 @@ export declare const OutboundDraftBlock: z.ZodObject<{
         target: z.ZodString;
         body: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        target: string;
         body: string;
-    }, {
         target: string;
+    }, {
         body: string;
+        target: string;
     }>;
     toolCall: z.ZodObject<{
         serviceName: z.ZodString;
@@ -55,8 +55,8 @@ export declare const OutboundDraftBlock: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     actionType: "slack_message" | "email" | "service_tool_call";
     summary: {
-        target: string;
         body: string;
+        target: string;
     };
     toolCall: {
         serviceName: string;
@@ -66,8 +66,8 @@ export declare const OutboundDraftBlock: z.ZodObject<{
 }, {
     actionType: "slack_message" | "email" | "service_tool_call";
     summary: {
-        target: string;
         body: string;
+        target: string;
     };
     toolCall: {
         serviceName: string;
@@ -86,11 +86,11 @@ export declare const OutboundDraftContent: z.ZodObject<{
             target: z.ZodString;
             body: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            target: string;
             body: string;
-        }, {
             target: string;
+        }, {
             body: string;
+            target: string;
         }>;
         toolCall: z.ZodObject<{
             serviceName: z.ZodString;
@@ -108,8 +108,8 @@ export declare const OutboundDraftContent: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         actionType: "slack_message" | "email" | "service_tool_call";
         summary: {
-            target: string;
             body: string;
+            target: string;
         };
         toolCall: {
             serviceName: string;
@@ -119,8 +119,8 @@ export declare const OutboundDraftContent: z.ZodObject<{
     }, {
         actionType: "slack_message" | "email" | "service_tool_call";
         summary: {
-            target: string;
             body: string;
+            target: string;
         };
         toolCall: {
             serviceName: string;
@@ -141,8 +141,8 @@ export declare const OutboundDraftContent: z.ZodObject<{
     draft: {
         actionType: "slack_message" | "email" | "service_tool_call";
         summary: {
-            target: string;
             body: string;
+            target: string;
         };
         toolCall: {
             serviceName: string;
@@ -159,8 +159,8 @@ export declare const OutboundDraftContent: z.ZodObject<{
     draft: {
         actionType: "slack_message" | "email" | "service_tool_call";
         summary: {
-            target: string;
             body: string;
+            target: string;
         };
         toolCall: {
             serviceName: string;

package/bundle/shared/dist/worker-sessions.d.ts

@@ -44,6 +44,14 @@ export declare const WorkerSession: z.ZodObject<{
     processPid: z.ZodNullable<z.ZodNumber>;
     processOwner: z.ZodNullable<z.ZodString>;
     processStartedAt: z.ZodNullable<z.ZodString>;
+    /**
+     * Opaque Agent Deck correlation UUID for this session (NOT-305). Generated once at
+     * session creation, before spawn, and passed as observability metadata in every
+     * runtime's Agent Deck launch configuration. Lets Deck correlate its normalized
+     * playbook-fetch stream back to this durable Dealer session without granting any
+     * authority. Null only for rows written before NOT-305.
+     */
+    deckCorrelationId: z.ZodNullable<z.ZodString>;
     createdAt: z.ZodString;
     startedAt: z.ZodNullable<z.ZodString>;
     heartbeatAt: z.ZodNullable<z.ZodString>;
@@ -70,6 +78,7 @@ export declare const WorkerSession: z.ZodObject<{
     processPid: number | null;
     processOwner: string | null;
     processStartedAt: string | null;
+    deckCorrelationId: string | null;
     createdAt: string;
     startedAt: string | null;
     heartbeatAt: string | null;
@@ -96,6 +105,7 @@ export declare const WorkerSession: z.ZodObject<{
     processPid: number | null;
     processOwner: string | null;
     processStartedAt: string | null;
+    deckCorrelationId: string | null;
     createdAt: string;
     startedAt: string | null;
     heartbeatAt: string | null;

package/bundle/shared/dist/worker-sessions.js

@@ -50,6 +50,14 @@ export const WorkerSession = z.object({
     processPid: z.number().int().nullable(),
     processOwner: z.string().nullable(),
     processStartedAt: z.string().nullable(),
+    /**
+     * Opaque Agent Deck correlation UUID for this session (NOT-305). Generated once at
+     * session creation, before spawn, and passed as observability metadata in every
+     * runtime's Agent Deck launch configuration. Lets Deck correlate its normalized
+     * playbook-fetch stream back to this durable Dealer session without granting any
+     * authority. Null only for rows written before NOT-305.
+     */
+    deckCorrelationId: z.string().uuid().nullable(),
     createdAt: z.string(),
     startedAt: z.string().nullable(),
     heartbeatAt: z.string().nullable(),

package/bundle/shared/dist/worker-sessions.test.js

@@ -23,6 +23,7 @@ test("WorkerSession schema parses a queued developer session", () => {
         processPid: null,
         processOwner: null,
         processStartedAt: null,
+        deckCorrelationId: null,
         createdAt: new Date().toISOString(),
         startedAt: null,
         heartbeatAt: null,

package/bundle/shared/dist/workflow.d.ts

@@ -24,7 +24,7 @@ export declare const WorkflowInstance: z.ZodObject<{
     outcome: "done" | "closed" | "migrated" | null;
 }>;
 export type WorkflowInstance = z.infer<typeof WorkflowInstance>;
-export declare const WorkflowEventType: z.ZodEnum<["issue.created", "issue.reassigned", "workflow.started", "worker.started", "worker.completed", "worker.failed", "worker.deferred", "worktree.ready", "deck.connected", "brief.resolved", "branch.pushed", "checks.started", "pull_request.opened", "pull_request.updated", "checks.completed", "review.submitted", "repair.started", "guidance.added", "task_snapshot.refreshed", "human_action.requested", "human_action.resolved", "final_review.requested", "issue.completed", "issue.closed", "queue.enqueued", "queue.wait_reason_changed", "queue.admitted", "queue.removed", "agent.started", "agent.completed", "host.suspended", "checkpoint.observed", "retry.reused", "legacy.imported"]>;
+export declare const WorkflowEventType: z.ZodEnum<["issue.created", "issue.reassigned", "workflow.started", "worker.started", "worker.completed", "worker.failed", "worker.deferred", "worktree.ready", "deck.connected", "brief.resolved", "branch.pushed", "checks.started", "pull_request.opened", "pull_request.updated", "checks.completed", "review.submitted", "repair.started", "guidance.added", "task_snapshot.refreshed", "human_action.requested", "human_action.resolved", "final_review.requested", "issue.completed", "issue.closed", "queue.enqueued", "queue.wait_reason_changed", "queue.admitted", "queue.removed", "agent.started", "agent.completed", "host.suspended", "checkpoint.observed", "retry.reused", "auto_merge.conflict_sync", "auto_merge.conflict_repair_queued", "legacy.imported"]>;
 export type WorkflowEventType = z.infer<typeof WorkflowEventType>;
 export declare const WorkflowEvent: z.ZodObject<{
     id: z.ZodString;
@@ -32,7 +32,7 @@ export declare const WorkflowEvent: z.ZodObject<{
     /** Nullable only for issue creation/guidance emitted before any workflow starts. */
     workflowInstanceId: z.ZodNullable<z.ZodString>;
     workerSessionId: z.ZodNullable<z.ZodString>;
-    type: z.ZodEnum<["issue.created", "issue.reassigned", "workflow.started", "worker.started", "worker.completed", "worker.failed", "worker.deferred", "worktree.ready", "deck.connected", "brief.resolved", "branch.pushed", "checks.started", "pull_request.opened", "pull_request.updated", "checks.completed", "review.submitted", "repair.started", "guidance.added", "task_snapshot.refreshed", "human_action.requested", "human_action.resolved", "final_review.requested", "issue.completed", "issue.closed", "queue.enqueued", "queue.wait_reason_changed", "queue.admitted", "queue.removed", "agent.started", "agent.completed", "host.suspended", "checkpoint.observed", "retry.reused", "legacy.imported"]>;
+    type: z.ZodEnum<["issue.created", "issue.reassigned", "workflow.started", "worker.started", "worker.completed", "worker.failed", "worker.deferred", "worktree.ready", "deck.connected", "brief.resolved", "branch.pushed", "checks.started", "pull_request.opened", "pull_request.updated", "checks.completed", "review.submitted", "repair.started", "guidance.added", "task_snapshot.refreshed", "human_action.requested", "human_action.resolved", "final_review.requested", "issue.completed", "issue.closed", "queue.enqueued", "queue.wait_reason_changed", "queue.admitted", "queue.removed", "agent.started", "agent.completed", "host.suspended", "checkpoint.observed", "retry.reused", "auto_merge.conflict_sync", "auto_merge.conflict_repair_queued", "legacy.imported"]>;
     actorType: z.ZodEnum<["human", "developer", "reviewer", "system"]>;
     actorRef: z.ZodNullable<z.ZodString>;
     /** Issue status at emit time — lets the timeline render without re-deriving state. */
@@ -45,7 +45,7 @@ export declare const WorkflowEvent: z.ZodObject<{
     causationEventId: z.ZodNullable<z.ZodString>;
     ts: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    type: "issue.created" | "issue.reassigned" | "workflow.started" | "worker.started" | "worker.completed" | "worker.failed" | "worker.deferred" | "worktree.ready" | "deck.connected" | "brief.resolved" | "branch.pushed" | "checks.started" | "pull_request.opened" | "pull_request.updated" | "checks.completed" | "review.submitted" | "repair.started" | "guidance.added" | "task_snapshot.refreshed" | "human_action.requested" | "human_action.resolved" | "final_review.requested" | "issue.completed" | "issue.closed" | "queue.enqueued" | "queue.wait_reason_changed" | "queue.admitted" | "queue.removed" | "agent.started" | "agent.completed" | "host.suspended" | "checkpoint.observed" | "retry.reused" | "legacy.imported";
+    type: "issue.created" | "issue.reassigned" | "workflow.started" | "worker.started" | "worker.completed" | "worker.failed" | "worker.deferred" | "worktree.ready" | "deck.connected" | "brief.resolved" | "branch.pushed" | "checks.started" | "pull_request.opened" | "pull_request.updated" | "checks.completed" | "review.submitted" | "repair.started" | "guidance.added" | "task_snapshot.refreshed" | "human_action.requested" | "human_action.resolved" | "final_review.requested" | "issue.completed" | "issue.closed" | "queue.enqueued" | "queue.wait_reason_changed" | "queue.admitted" | "queue.removed" | "agent.started" | "agent.completed" | "host.suspended" | "checkpoint.observed" | "retry.reused" | "auto_merge.conflict_sync" | "auto_merge.conflict_repair_queued" | "legacy.imported";
     id: string;
     issueId: string;
     round: number | null;
@@ -60,7 +60,7 @@ export declare const WorkflowEvent: z.ZodObject<{
     causationEventId: string | null;
     ts: string;
 }, {
-    type: "issue.created" | "issue.reassigned" | "workflow.started" | "worker.started" | "worker.completed" | "worker.failed" | "worker.deferred" | "worktree.ready" | "deck.connected" | "brief.resolved" | "branch.pushed" | "checks.started" | "pull_request.opened" | "pull_request.updated" | "checks.completed" | "review.submitted" | "repair.started" | "guidance.added" | "task_snapshot.refreshed" | "human_action.requested" | "human_action.resolved" | "final_review.requested" | "issue.completed" | "issue.closed" | "queue.enqueued" | "queue.wait_reason_changed" | "queue.admitted" | "queue.removed" | "agent.started" | "agent.completed" | "host.suspended" | "checkpoint.observed" | "retry.reused" | "legacy.imported";
+    type: "issue.created" | "issue.reassigned" | "workflow.started" | "worker.started" | "worker.completed" | "worker.failed" | "worker.deferred" | "worktree.ready" | "deck.connected" | "brief.resolved" | "branch.pushed" | "checks.started" | "pull_request.opened" | "pull_request.updated" | "checks.completed" | "review.submitted" | "repair.started" | "guidance.added" | "task_snapshot.refreshed" | "human_action.requested" | "human_action.resolved" | "final_review.requested" | "issue.completed" | "issue.closed" | "queue.enqueued" | "queue.wait_reason_changed" | "queue.admitted" | "queue.removed" | "agent.started" | "agent.completed" | "host.suspended" | "checkpoint.observed" | "retry.reused" | "auto_merge.conflict_sync" | "auto_merge.conflict_repair_queued" | "legacy.imported";
     id: string;
     issueId: string;
     round: number | null;

package/bundle/shared/dist/workflow.js

@@ -59,6 +59,16 @@ export const WorkflowEventType = z.enum([
      * per session via idempotency keys and never drive retry/routing decisions. */
     "checkpoint.observed",
     "retry.reused",
+    /** NOT-310: merge-time base-sync attempt after a not-mergeable failure. Payload
+     * carries `outcome` (skipped | merged | repair_queued | conflict_spent |
+     * failed) plus the branch, base, and (for conflicts) the conflicting files.
+     * Audit only — never re-read. */
+    "auto_merge.conflict_sync",
+    /** NOT-310: conflict-repair developer round queued after the sync hit a textual
+     * conflict (payload: baseBranch, branch, files, round, workItemId). Append-only
+     * bound key: a later not-mergeable failure with no `human_action.resolved` after
+     * this event escalates with the file list instead of syncing again. */
+    "auto_merge.conflict_repair_queued",
     /** Migration-only — the NOT-66 cutover repoints a legacy `events` row under this type,
      * preserving the original type/payload inside `payloadJson` (see `role: "legacy"` on
      * `WorkerSessionRole` and `outcome: "migrated"` on `WorkflowInstanceOutcome` for the same

package/bundle/shared/dist/workflow.test.js

@@ -41,6 +41,8 @@ test("WorkflowEventType accepts every PRD §9.2 event type", () => {
         "queue.removed",
         "checkpoint.observed",
         "retry.reused",
+        "auto_merge.conflict_sync",
+        "auto_merge.conflict_repair_queued",
     ];
     for (const t of types) {
         assert.equal(WorkflowEventType.parse(t), t);

package/bundle/shared/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-dealer/shared",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-dealer",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "Human control plane for agent execution — queue, plan approval, audit",
   "license": "MIT",
   "type": "module",