hanoman 0.1.12 → 0.1.13

package/dist/server.js

@@ -4269,6 +4269,39 @@ var init_telegram = __esm({
   }
 });
 
+// ../shared/src/auto-merge.ts
+function autoMergeOf(raw) {
+  if (raw === null || raw === void 0) return null;
+  const p = zAutoMerge.safeParse(raw);
+  return p.success ? p.data : null;
+}
+function resolveAutoMerge(projectRaw, specRaw) {
+  return autoMergeOf(specRaw) ?? autoMergeOf(projectRaw) ?? AUTO_MERGE_OFF;
+}
+function autoMergeTargetOf(p, defaultBranch2) {
+  if (p.mode === "off") return null;
+  const name2 = p.mode === "branch" ? p.branch : defaultBranch2;
+  return name2 ? `${p.dest}:${name2}` : null;
+}
+var AUTO_MERGE_MODES, zAutoMerge, AUTO_MERGE_OFF;
+var init_auto_merge = __esm({
+  "../shared/src/auto-merge.ts"() {
+    "use strict";
+    init_zod();
+    AUTO_MERGE_MODES = ["off", "default-branch", "branch"];
+    zAutoMerge = external_exports.object({
+      mode: external_exports.enum(AUTO_MERGE_MODES).default("off"),
+      // Tujuan: `local` = perbarui ref/fast-forward di checkout ini; `origin` = push.
+      dest: external_exports.enum(["local", "origin"]).default("local"),
+      // Hanya bermakna saat mode = "branch". Untuk "default-branch" ia diresolve SAAT EKSEKUSI.
+      branch: external_exports.string().min(1).nullable().default(null),
+      // Hapus `hanoman/<spec>` (lokal + origin) — HANYA sesudah merge terbukti bersih.
+      deleteBranch: external_exports.boolean().default(false)
+    });
+    AUTO_MERGE_OFF = { mode: "off", dest: "local", branch: null, deleteBranch: false };
+  }
+});
+
 // ../shared/src/entities.ts
 function codexModel(id) {
   return CODEX_MODELS.find((m) => m.id === id);
@@ -4287,13 +4320,14 @@ function cmpVersion(a, b) {
   }
   return 0;
 }
-var zProject, zBriefPayload, zQaPayload, zGoalPayload, zSpecBlocker, zSpec, NOTIFY_SOUNDS, E_5_6, E_LUNA, E_BASE, CODEX_MODELS, RETIRED_CODEX_MODELS, zCodex, CODEX_DEFAULTS, zSourceCommon, zScheduler, SCHEDULER_DEFAULTS, zGoal, GOAL_DEFAULTS, zConflict, CONFLICT_DEFAULTS, zLeadEngine, zLead, LEAD_DEFAULTS, zSetting, zNotification, zDocFile, zDeviceTokenView;
+var zProject, zBriefPayload, zQaPayload, zGoalPayload, zSpecBlocker, zSpec, NOTIFY_SOUNDS, MODELS, E_5_6, E_LUNA, E_BASE, CODEX_MODELS, RETIRED_CODEX_MODELS, zCodex, CODEX_DEFAULTS, zSourceCommon, zScheduler, SCHEDULER_DEFAULTS, zGoal, GOAL_DEFAULTS, zConflict, CONFLICT_DEFAULTS, zLeadEngine, zLead, LEAD_DEFAULTS, zSetting, zNotification, zDocFile, zDeviceTokenView;
 var init_entities = __esm({
   "../shared/src/entities.ts"() {
     "use strict";
     init_zod();
     init_enums();
     init_telegram();
+    init_auto_merge();
     zProject = external_exports.object({
       id: external_exports.string(),
       name: external_exports.string(),
@@ -4359,7 +4393,10 @@ var init_entities = __esm({
       dependsOn: external_exports.array(external_exports.string()).default([]),
       // Turunan (bukan kolom): dihitung `liveSpecs` dari stage dependency + git. Klien tak pernah
       // mengirimkannya — `.default([])` supaya bentuk lama tetap parse.
-      blockedBy: external_exports.array(zSpecBlocker).default([])
+      blockedBy: external_exports.array(zSpecBlocker).default([]),
+      // SPEC-486 · ADR-0103 · override kebijakan auto-merge item ini; null = warisi project.
+      // `.nullable().default(null)` menjaga respons/klien versi lama tetap parse.
+      autoMerge: zAutoMerge.nullable().default(null)
     });
     NOTIFY_SOUNDS = [
       "off",
@@ -4377,6 +4414,12 @@ var init_entities = __esm({
       "marimba",
       "fanfare"
     ];
+    MODELS = [
+      { id: "claude-opus-5", label: "Opus 5" },
+      { id: "claude-sonnet-5", label: "Sonnet 5" },
+      { id: "claude-haiku-4-5", label: "Haiku 4.5" },
+      { id: "claude-fable-5", label: "Fable 5" }
+    ];
     E_5_6 = ["ultra", "max", "xhigh", "high", "medium", "low"];
     E_LUNA = ["max", "xhigh", "high", "medium", "low"];
     E_BASE = ["xhigh", "high", "medium", "low"];
@@ -4460,6 +4503,11 @@ var init_entities = __esm({
       // `requestTimeout: 0` (terukur dari `buildApp()`) — tak ada pihak lain yang akan memutus peminta.
       // 0 = tanpa antrean sama sekali: penuh berarti langsung ditolak.
       queueWaitSec: external_exports.number().int().min(0).max(900).default(120),
+      // SPEC-485 · ADR-0102 · umur maksimum satu RANTAI keputusan yang dibiarkan terbuka. Peminta bisa
+      // mati di tengah rantai (sesi ditutup, agen crash); tanpa batas ini alurnya `sebagian` selamanya
+      // dan tak ada yang tahu apakah ia masih ditunggu. Penyapunya menumpang tick lead yang sudah ada —
+      // ADR-0024 melarang timer/scheduler baru.
+      flowTtlMin: external_exports.number().int().min(1).max(1440).default(60),
       // OQ-3 · syarat objektif sebelum lead boleh mengintegrasikan ke branch utama. Default MENYALA:
       // risiko "kode masuk main tanpa mata manusia" diterima sadar, tapi syaratnya tetap terukur.
       requireGreenBeforeIntegrate: external_exports.boolean().default(true),
@@ -4642,6 +4690,9 @@ function mentionsOf(v) {
   for (const x of v) if (typeof x === "string" && x && !out3.includes(x)) out3.push(x);
   return out3;
 }
+function runtimeOf(v) {
+  return typeof v === "string" && AGENT_RUNTIMES.includes(v) ? v : null;
+}
 function toolsOf(v) {
   if (!Array.isArray(v)) return null;
   const out3 = [];
@@ -4685,11 +4736,17 @@ function effectiveAgents(globals, project) {
   for (const a of project) byName.set(a.name, a);
   return [...byName.values()].filter((a) => a.enabled).sort((x, y) => x.name.localeCompare(y.name));
 }
-var AGENT_NAME_RE, DEFAULT_AGENT_TOOLS, MENTION_TOOL, MENTION_MAX_HOPS, GLOBAL_SCOPE, zCustomAgent, zCreateCustomAgent, zUpdateCustomAgent, customAgentId;
+var AGENT_RUNTIMES, zAgentRuntime, AGENT_RUNTIME_LABELS, AGENT_NAME_RE, DEFAULT_AGENT_TOOLS, MENTION_TOOL, MENTION_MAX_HOPS, GLOBAL_SCOPE, zCustomAgent, zCreateCustomAgent, zUpdateCustomAgent, customAgentId;
 var init_custom_agent = __esm({
   "../shared/src/custom-agent.ts"() {
     "use strict";
     init_zod();
+    AGENT_RUNTIMES = ["claude", "codex"];
+    zAgentRuntime = external_exports.enum(AGENT_RUNTIMES);
+    AGENT_RUNTIME_LABELS = {
+      claude: "Claude Code",
+      codex: "Codex CLI"
+    };
     AGENT_NAME_RE = /^[a-z][a-z0-9-]{1,39}$/;
     DEFAULT_AGENT_TOOLS = [
       "Read",
@@ -4713,6 +4770,7 @@ var init_custom_agent = __esm({
       tools: external_exports.array(external_exports.string()).nullable(),
       model: external_exports.string().nullable(),
       mentions: external_exports.array(external_exports.string()).nullable(),
+      runtime: external_exports.enum(AGENT_RUNTIMES).nullable(),
       enabled: external_exports.boolean(),
       createdAt: external_exports.string(),
       updatedAt: external_exports.string()
@@ -4725,6 +4783,8 @@ var init_custom_agent = __esm({
       tools: external_exports.array(external_exports.string()).nullable().optional(),
       model: external_exports.string().nullable().optional(),
       mentions: external_exports.array(external_exports.string()).nullable().optional(),
+      // SPEC-484 · ADR-0101 · PENYARING mesin sesi, bukan pemilih proses. null/absen = ikut sesi induk.
+      runtime: external_exports.enum(AGENT_RUNTIMES).nullable().optional(),
       enabled: external_exports.boolean().optional()
     });
     zUpdateCustomAgent = zCreateCustomAgent.omit({ name: true, projectId: true }).partial();
@@ -4732,6 +4792,44 @@ var init_custom_agent = __esm({
   }
 });
 
+// ../shared/src/agent-catalog.ts
+function modelsForRuntime(rt) {
+  const claude = MODELS.map((m) => ({ id: m.id, label: m.label, runtime: "claude" }));
+  const codex2 = CODEX_MODELS.map((m) => ({ id: m.id, label: m.label, runtime: "codex" }));
+  if (rt === "claude") return claude;
+  if (rt === "codex") return codex2;
+  return [...claude, ...codex2];
+}
+function expandTools(tools, catalogIds) {
+  if (tools === null) return null;
+  if (!tools.includes(ALL_TOOLS)) return tools;
+  return catalogIds.filter((id) => id !== ALL_TOOLS);
+}
+var ALL_TOOLS, ALL_TOOLS_ENTRY, BUILTIN_AGENT_TOOLS, mcpToolEntry;
+var init_agent_catalog = __esm({
+  "../shared/src/agent-catalog.ts"() {
+    "use strict";
+    init_custom_agent();
+    init_entities();
+    ALL_TOOLS = "*";
+    ALL_TOOLS_ENTRY = {
+      id: ALL_TOOLS,
+      label: "Semua tools",
+      group: "shortcut"
+    };
+    BUILTIN_AGENT_TOOLS = DEFAULT_AGENT_TOOLS.map((id) => ({
+      id,
+      label: id,
+      group: "builtin"
+    }));
+    mcpToolEntry = (server) => ({
+      id: `mcp__${server}__*`,
+      label: `${server} \u2014 semua tool`,
+      group: "mcp"
+    });
+  }
+});
+
 // ../shared/src/github.ts
 function sourceForLabels(labels) {
   const hay = labels.map((l) => l.toLowerCase());
@@ -4807,6 +4905,36 @@ function resolveChoice(raw, options2) {
   if (byPrefix.length === 1) return pick2(byPrefix[0]);
   return null;
 }
+function normalizeSelect(sel, optionCount) {
+  const n2 = Math.max(0, optionCount);
+  if (sel.mode === "single") return { mode: "single", min: Math.min(sel.min, 1), max: 1 };
+  const max = Math.min(sel.max ?? n2, n2);
+  return { mode: "multi", min: Math.min(sel.min, max), max };
+}
+function resolveChoices(raw, options2) {
+  const seen = /* @__PURE__ */ new Set();
+  const choices = [];
+  const rejected = [];
+  for (const r of raw ?? []) {
+    const t = (r ?? "").trim();
+    if (!t) continue;
+    const hit = resolveChoice(t, options2);
+    if (!hit) {
+      rejected.push(t);
+      continue;
+    }
+    if (seen.has(hit.index)) continue;
+    seen.add(hit.index);
+    choices.push(hit);
+  }
+  choices.sort((a, b) => a.index - b.index);
+  return { choices, rejected };
+}
+function checkChoiceCount(n2, b) {
+  if (n2 > b.max) return `pilihan terlalu banyak (${n2}) \u2014 paling banyak ${b.max}`;
+  if (n2 < b.min) return `pilihan terlalu sedikit (${n2}) \u2014 paling sedikit ${b.min}`;
+  return null;
+}
 function clampProse(s2, max) {
   const t = (s2 ?? "").replace(/\s+/g, " ").trim();
   if (t.length <= max) return t;
@@ -4824,10 +4952,11 @@ function leadReplyText(d) {
   const budget = LEAD_DECISION_MAX + LEAD_REASON_MAX;
   if (d.missing.length)
     return clampProse(`Belum bisa kuputuskan. Yang kurang: ${d.missing.join("; ")}.`, budget);
-  if (d.choice) return clampProse(`Pilih: ${d.choice.option}. ${d.reason}`, budget);
+  const picked = d.choices?.length ? d.choices : d.choice ? [d.choice] : [];
+  if (picked.length) return clampProse(`Pilih: ${picked.map((c) => c.option).join("; ")}. ${d.reason}`, budget);
   return clampProse(d.reply || d.decision, budget);
 }
-var zLeadGate, zLeadKind, zLeadConfidence, zLeadStatus, LEAD_ACTIONS, zLeadAction, LEAD_FORBIDDEN, zLeadChoice, LEAD_DECISION_MAX, LEAD_REASON_MAX, norm, headOf, zLeadVerdict, zLeadAsk, zLeadOverride;
+var zLeadGate, zLeadKind, zLeadConfidence, zLeadStatus, zLeadFlowStatus, LEAD_FLOW_OPEN, LEAD_ACTIONS, zLeadAction, LEAD_FORBIDDEN, zLeadChoice, LEAD_DECISION_MAX, LEAD_REASON_MAX, norm, headOf, zLeadSelect, zLeadVerdict, zLeadAsk, zLeadOverride;
 var init_lead = __esm({
   "../shared/src/lead.ts"() {
     "use strict";
@@ -4836,6 +4965,8 @@ var init_lead = __esm({
     zLeadKind = external_exports.enum(["answer", "order", "collision", "quality", "refusal"]);
     zLeadConfidence = external_exports.enum(["tinggi", "sedang", "ragu"]);
     zLeadStatus = external_exports.enum(["berlaku", "ditimpa", "dibatalkan", "gagal"]);
+    zLeadFlowStatus = external_exports.enum(["menunggu", "sebagian", "selesai", "dibatalkan"]);
+    LEAD_FLOW_OPEN = ["menunggu", "sebagian"];
     LEAD_ACTIONS = [
       "none",
       // keputusan murni jawaban; tak ada tindakan menyusul
@@ -4878,6 +5009,11 @@ var init_lead = __esm({
     LEAD_REASON_MAX = 480;
     norm = (s2) => s2.replace(/\s+/g, " ").trim().toLowerCase();
     headOf = (s2) => norm(s2.split(/\s+[—–-]\s+|:/)[0] ?? s2);
+    zLeadSelect = external_exports.object({
+      mode: external_exports.enum(["single", "multi"]).default("single"),
+      min: external_exports.number().int().min(0).max(20).default(0),
+      max: external_exports.number().int().min(1).max(20).nullable().default(null)
+    });
     zLeadVerdict = external_exports.object({
       decision: external_exports.string().min(1),
       reason: external_exports.string().min(1),
@@ -4894,6 +5030,14 @@ var init_lead = __esm({
        * yang sama persis dengan `action` di atas.
        */
       choice: external_exports.string().default(""),
+      /**
+       * SPEC-485 · pilihan JAMAK. `string[]` dengan alasan yang sama persis seperti `choice` & `action`
+       * di atas: pilihan di luar daftar harus BISA MASUK supaya server menolaknya secara sadar dan
+       * mencatatnya. Kosong + `choice` terisi dibaca sebagai satu pilihan — keluaran agen berbentuk
+       * ADR-0098 harus tetap terpakai, dan menuntut field baru berarti setiap agen lama mendadak
+       * "tak memilih apa pun".
+       */
+      choices: external_exports.array(external_exports.string().max(2e3)).max(20).default([]),
       /**
        * SPEC-480 · apa yang KURANG bila konteksnya memang tak cukup untuk memutuskan. Bukan pengganti
        * `confidence: "ragu"` (bukti tipis, jawabannya tetap ada) melainkan untuk fakta konkret yang
@@ -4909,11 +5053,23 @@ var init_lead = __esm({
       sessionId: external_exports.string().nullish(),
       question: external_exports.string().min(1).max(8e3),
       options: external_exports.array(external_exports.string().max(2e3)).max(20).default([]),
-      context: external_exports.string().max(2e4).default("")
+      context: external_exports.string().max(2e4).default(""),
+      /** SPEC-485 · bentuk pilihan yang diminta peminta. Default = perilaku hari ini (single). */
+      select: zLeadSelect.default({ mode: "single", min: 0, max: null }),
+      /** `true` = peminta akan mengajukan pertanyaan lanjutan; alurnya dibiarkan terbuka sampai submit. */
+      chain: external_exports.boolean().default(false),
+      /** Lanjutkan rantai yang sudah ada. Alur tertutup ditolak 409 — bukan dibuatkan diam-diam. */
+      flowId: external_exports.string().min(1).nullish().default(null)
     });
     zLeadOverride = external_exports.object({
       answer: external_exports.string().min(1).max(8e3),
-      reason: external_exports.string().max(8e3).default("")
+      reason: external_exports.string().max(8e3).default(""),
+      /**
+       * SPEC-485 · centang operator sebagai DATA, bukan prosa. Dipetakan ke opsi baris yang ditimpa,
+       * lalu ikut diketikkan ke pane — jadi manusia mencentang di dashboard dan kotaknya benar-benar
+       * tercentang di dialog sesi.
+       */
+      choices: external_exports.array(external_exports.string().max(2e3)).max(20).default([])
     });
   }
 });
@@ -4922,13 +5078,14 @@ var init_lead = __esm({
 function flowForSource(source) {
   return source === "qa" ? "qa" : source === "audit" ? "audit" : source === "goal" ? "goal" : "feature";
 }
-var zIssueDeviceToken, zSessionResult, zSessionHistory, zCreateProject, zProjectId, zRenameProject, zUpdateProject, zCreateSpec, zPatchSpec, zIntegrate, zSessionSummary, zProjectView, zSchedulerQueueItem, zSchedulerSourceView, zSchedulerSessionView, zSchedulerState, zLeadDecisionView, zLeadAnswer, zLeadProjectStatus, zLeadStatusView, zFlow, zPrdBrief, zPrdDoc, zBreakdownItem, zBreakdownDoc, zBatchCreateSpec, zEscalationTarget, zEscalationPrefill, zAuditEscalation, zAuditEscalationView, zTerminalSession, zDocFileContent, zDocIndexCat, zDocIndex, HOST_RE, USER_RE, zCreateVps, zPatchVps, zLogin, zSignup, zChangePassword, zVpsCheck, zMarkNa, zMarkNaBulk, zAttest, zRemediate, UPDATE_RESTART_EXIT, zUpdateApplyBody, zTicketView, zTicketAttachmentView, zTicketDetail, zTicketEditInput, zHelpInfo, zPublicTicketStatus;
+var zIssueDeviceToken, zSessionResult, zSessionHistory, zCreateProject, zProjectId, zRenameProject, zUpdateProject, zCreateSpec, zPatchSpec, zIntegrate, zSessionSummary, zProjectView, zSchedulerQueueItem, zSchedulerSourceView, zSchedulerSessionView, zSchedulerState, zLeadDecisionView, zLeadFlowView, zLeadAnswer, zLeadProjectStatus, zLeadStatusView, zFlow, zPrdBrief, zPrdDoc, zBreakdownItem, zBreakdownDoc, zBatchCreateSpec, zEscalationTarget, zEscalationPrefill, zAuditEscalation, zAuditEscalationView, zTerminalSession, zDocFileContent, zDocIndexCat, zDocIndex, HOST_RE, USER_RE, zCreateVps, zPatchVps, zLogin, zSignup, zChangePassword, zVpsCheck, zMarkNa, zMarkNaBulk, zAttest, zRemediate, UPDATE_RESTART_EXIT, zUpdateApplyBody, zTicketView, zTicketAttachmentView, zTicketDetail, zTicketEditInput, zHelpInfo, zPublicTicketStatus;
 var init_dto = __esm({
   "../shared/src/dto.ts"() {
     "use strict";
     init_zod();
     init_entities();
     init_lead();
+    init_auto_merge();
     init_enums();
     zIssueDeviceToken = external_exports.object({ name: external_exports.string().min(1) });
     zSessionResult = external_exports.object({
@@ -4981,8 +5138,11 @@ var init_dto = __esm({
       // SPEC-217 · path default/server editable (null = kosongkan)
       schedulerOptIn: external_exports.boolean().optional(),
       // SPEC-294 · opt-in scheduler otonom (lokal, tak disync)
-      leadOptIn: external_exports.boolean().optional()
+      leadOptIn: external_exports.boolean().optional(),
       // SPEC-409 · ADR-0091 · opt-in hanoman-lead (lokal, tak disync)
+      // SPEC-486 · ADR-0103 · kebijakan auto-merge project (null = kosongkan → tanpa auto-merge).
+      // Divalidasi server terhadap repo (checkAutoMerge): repoDir wajib ada, branch wajib nyata.
+      autoMerge: zAutoMerge.nullable().optional()
     });
     zCreateSpec = external_exports.object({
       project: external_exports.string(),
@@ -5011,7 +5171,11 @@ var init_dto = __esm({
       // SPEC-447 · ADR-0093 · SENGAJA di luar gerbang `editingContent` (SPEC-186): gerbang itu
       // melindungi konten yang sudah jadi dasar kerja sesi berjalan, sedangkan dependsOn hanya
       // menggerbangi peluncuran BERIKUTNYA. `[]` = kosongkan.
-      dependsOn: external_exports.array(external_exports.string()).optional()
+      dependsOn: external_exports.array(external_exports.string()).optional(),
+      // SPEC-486 · ADR-0103 · override per item; `null` mengembalikannya ke warisan project.
+      // SENGAJA di luar gerbang `editingContent` (SPEC-186), sama seperti dependsOn: ia menggerbangi
+      // apa yang terjadi SESUDAH kerja, bukan konten yang sedang dikerjakan sesi hidup.
+      autoMerge: zAutoMerge.nullable().optional()
     });
     zIntegrate = external_exports.object({
       op: external_exports.enum(["merge", "rebase"]),
@@ -5034,7 +5198,9 @@ var init_dto = __esm({
       // SPEC-253 · Help Center publik aktif
       schedulerOptIn: external_exports.boolean().default(false),
       // SPEC-294 · opt-in scheduler otonom
-      leadOptIn: external_exports.boolean().default(false)
+      leadOptIn: external_exports.boolean().default(false),
+      // SPEC-409 · ADR-0091 · opt-in hanoman-lead
+      autoMerge: zAutoMerge.nullable().default(null)
     });
     zSchedulerQueueItem = external_exports.object({
       id: external_exports.string(),
@@ -5091,11 +5257,32 @@ var init_dto = __esm({
       choiceIndex: external_exports.number().nullable().default(null),
       options: external_exports.array(external_exports.string()).default([]),
       missing: external_exports.array(external_exports.string()).default([]),
+      // SPEC-485 · ADR-0102 · jawaban SELALU daftar di permukaan baca. Baris pra-migrasi tak punya
+      // kolomnya, jadi `toDecisionView` MENURUNKANNYA dari `choice`/`choiceIndex` — itulah yang
+      // membuat riwayat lama tetap terbaca sesudah perubahan skema.
+      choices: external_exports.array(zLeadChoice).default([]),
+      select: zLeadSelect.nullable().default(null),
+      flowId: external_exports.string().nullable().default(null),
+      step: external_exports.number().nullable().default(null),
       status: zLeadStatus,
       weighty: external_exports.boolean(),
       supersededById: external_exports.string().nullable(),
       createdAt: external_exports.string()
     });
+    zLeadFlowView = external_exports.object({
+      id: external_exports.string(),
+      projectId: external_exports.string(),
+      specId: external_exports.string().nullable(),
+      sessionId: external_exports.string().nullable(),
+      gate: zLeadGate,
+      status: zLeadFlowStatus,
+      title: external_exports.string(),
+      steps: external_exports.number(),
+      closeReason: external_exports.string().nullable(),
+      openedAt: external_exports.string(),
+      closedAt: external_exports.string().nullable(),
+      expiresAt: external_exports.string()
+    });
     zLeadAnswer = external_exports.object({
       id: external_exports.string(),
       decision: external_exports.string(),
@@ -5107,7 +5294,12 @@ var init_dto = __esm({
       // dipilih sebagai field, bukan sesuatu yang harus ditebak dari `decision`. `decision`/`reason`
       // di sini TERPANGKAS (jejak penuh ada di `GET /lead/decisions`).
       choice: zLeadChoice.nullable().default(null),
-      missing: external_exports.array(external_exports.string()).default([])
+      missing: external_exports.array(external_exports.string()).default([]),
+      // SPEC-485 · ADR-0102 · `choices` adalah bentuk yang berlaku; `choice` di atas tinggal
+      // `choices[0]`. `flowId`/`flowStatus` memberi peminta pegangan untuk melanjutkan rantainya.
+      choices: external_exports.array(zLeadChoice).default([]),
+      flowId: external_exports.string().nullable().default(null),
+      flowStatus: zLeadFlowStatus.nullable().default(null)
     });
     zLeadProjectStatus = external_exports.object({
       projectId: external_exports.string(),
@@ -5467,8 +5659,15 @@ var init_api = __esm({
       leadDecisions: `${API}/lead/decisions`,
       leadDecisionOverride: (id) => `${API}/lead/decisions/${encodeURIComponent(id)}/override`,
       leadDecisionCancel: (id) => `${API}/lead/decisions/${encodeURIComponent(id)}/cancel`,
+      // SPEC-485 · ADR-0102 · rantai keputusan. Di bawah prefix `lead` supaya capability-nya turunan
+      // method (lead:read/lead:write) tanpa peta baru — kelas bug SPEC-405 sudah ditutup di sana.
+      leadFlows: `${API}/lead/flows`,
+      leadFlowSubmit: (id) => `${API}/lead/flows/${encodeURIComponent(id)}/submit`,
+      leadFlowCancel: (id) => `${API}/lead/flows/${encodeURIComponent(id)}/cancel`,
       // SPEC-450 · ADR-0094 · katalog custom agent. `?projectId=` → himpunan EFEKTIF (global+project).
       customAgents: `${API}/custom-agents`,
+      // SPEC-484 · ADR-0101 · sumber daftar tools/model/runtime untuk form (mention dari `customAgents`).
+      customAgentCatalog: `${API}/custom-agents/catalog`,
       // SPEC-481 · ADR-0100 · webhook keluar (cookie-only)
       webhooks: `${API}/webhooks`,
       webhook: (id) => `${API}/webhooks/${encodeURIComponent(id)}`,
@@ -5985,6 +6184,7 @@ var init_webhook = __esm({
           "baseSha",
           "headSha",
           "dependsOn",
+          "autoMerge",
           "createdAt",
           "startedAt",
           "updatedAt"
@@ -6014,6 +6214,7 @@ var init_webhook = __esm({
           baseSha: "5117298c5a3e63af76cbadaa46e2edfa50921d7",
           headSha: null,
           dependsOn: null,
+          autoMerge: null,
           createdAt: "2026-08-01T02:10:00.000Z",
           startedAt: "2026-08-01T02:12:31.000Z",
           updatedAt: "2026-08-01T09:41:22.000Z"
@@ -6033,6 +6234,7 @@ var init_webhook = __esm({
           "helpEnabled",
           "schedulerOptIn",
           "leadOptIn",
+          "autoMerge",
           "createdAt",
           "updatedAt"
         ],
@@ -6053,6 +6255,7 @@ var init_webhook = __esm({
           helpEnabled: false,
           schedulerOptIn: true,
           leadOptIn: false,
+          autoMerge: null,
           createdAt: "2026-05-02T04:00:00.000Z",
           updatedAt: "2026-08-01T09:00:00.000Z"
         }
@@ -6819,7 +7022,7 @@ var init_mcp_catalog = __esm({
       {
         name: "hanoman_lead_ask",
         title: "Minta putusan hanoman-lead",
-        description: "Minta putusan ke hanoman-lead saat menemui persimpangan yang biasanya butuh manusia. Jawabannya terbaca mesin (`decision`, `reason`, `refs`, `confidence`, `action`) dan `refs` hanya memuat rujukan yang benar-benar ada di repo. Panggilan ini melahirkan jejak permanen dan putusannya bisa menggerakkan sesi \u2014 pakai hanya saat memang buntu. 409 = lead tak aktif atau proyek belum opt-in: kembali ke perilaku biasa, berhenti dan tunggu manusia.",
+        description: "Minta putusan ke hanoman-lead saat menemui persimpangan yang biasanya butuh manusia. Jawabannya terbaca mesin (`decision`, `reason`, `refs`, `confidence`, `action`, `choices`) dan `refs` hanya memuat rujukan yang benar-benar ada di repo. Bila opsinya TIDAK saling eksklusif, set `multi: true` \u2014 balasannya memuat `choices` (daftar), bukan hanya `choice`. Panggilan ini melahirkan jejak permanen dan putusannya bisa menggerakkan sesi \u2014 pakai hanya saat memang buntu. 409 = lead tak aktif atau proyek belum opt-in: kembali ke perilaku biasa, berhenti dan tunggu manusia; 400 = bentuk `multi`/`minChoices`/`maxChoices` mustahil dipenuhi oleh daftar opsi yang kamu kirim.",
         inputSchema: obj({
           properties: {
             project: str("Id proyek."),
@@ -6827,7 +7030,10 @@ var init_mcp_catalog = __esm({
             spec: str("Opsional. Id backlog yang bersangkutan."),
             session: str("Opsional. Id sesi yang bersangkutan."),
             options: strArray("Opsional. Pilihan yang tersedia, maksimum 20, masing-masing maksimum 2000 karakter. Lead memilih salah satunya."),
-            context: str("Opsional. Konteks pendukung, maksimum 20.000 karakter.")
+            context: str("Opsional. Konteks pendukung, maksimum 20.000 karakter."),
+            multi: bool("Opsional. `true` bila opsinya TIDAK saling eksklusif dan lead boleh memilih beberapa sekaligus. Menuntut `options` terisi."),
+            minChoices: int("Opsional, hanya untuk `multi`. Paling sedikit berapa opsi harus dipilih."),
+            maxChoices: int("Opsional, hanya untuk `multi`. Paling banyak berapa opsi boleh dipilih; tanpa ini sebanyak opsinya.")
           },
           required: ["project", "question"]
         }),
@@ -6844,7 +7050,10 @@ var init_mcp_catalog = __esm({
             ...s(a.spec) ? { specId: a.spec } : {},
             ...s(a.session) ? { sessionId: a.session } : {},
             ...Array.isArray(a.options) ? { options: a.options } : {},
-            ...s(a.context) ? { context: a.context } : {}
+            ...s(a.context) ? { context: a.context } : {},
+            // SPEC-485 · ADITIF: tanpa `multi` bentuk permintaannya identik dengan sebelum ADR-0102,
+            // jadi klien MCP lama tak berubah perilakunya satu bit pun.
+            ...a.multi === true ? { select: { mode: "multi", min: n(a.minChoices) ?? 0, max: n(a.maxChoices) ?? null } } : {}
           }
         }),
         shape: (raw) => raw
@@ -6883,6 +7092,7 @@ var init_src = __esm({
     init_entities();
     init_agent();
     init_custom_agent();
+    init_agent_catalog();
     init_github();
     init_lead();
     init_dto();
@@ -6896,6 +7106,7 @@ var init_src = __esm({
     init_telegram();
     init_webhook();
     init_mcp();
+    init_auto_merge();
   }
 });
 
@@ -7726,9 +7937,9 @@ var init_custom_agents = __esm({
 // ../runner/src/paths.ts
 import { homedir } from "node:os";
 import { dirname as dirname2, isAbsolute as isAbsolute2, join, resolve as resolve4 } from "node:path";
-function resolveHome(env = process.env, home = homedir()) {
+function resolveHome(env = process.env, home2 = homedir()) {
   const v = env.HANOMAN_HOME?.trim();
-  return v ? v : join(home, ".hanoman");
+  return v ? v : join(home2, ".hanoman");
 }
 function schemeOf(raw) {
   return raw.split("://")[0] ?? "?";
@@ -8145,18 +8356,38 @@ function readChoiceDialog(paneText2) {
     expected -= 1;
   }
   if (run2.length < 2 || run2[0].n !== 1) return null;
-  const rows = run2.map((r) => ({
-    n: r.n,
-    label: r.label,
-    free: PLACEHOLDER.test(r.label),
-    chat: CHAT_ROW.test(r.label)
-  }));
+  const rows = run2.map((r) => {
+    const m = CHECK.exec(r.label);
+    const label = m ? (m[2] ?? "").trim() : r.label;
+    return {
+      n: r.n,
+      label,
+      checked: m ? m[1] !== " " : null,
+      free: PLACEHOLDER.test(label),
+      chat: CHAT_ROW.test(label)
+    };
+  });
+  let submit = { present: false, focused: false };
+  for (const line of lines2.slice(0, footer)) {
+    const m = SUBMIT_BTN.exec(line);
+    if (m) submit = { present: true, focused: !!m[1] };
+  }
   return {
     rows,
     freeIndex: rows.find((r) => r.free)?.n ?? null,
-    options: rows.filter((r) => !r.free && !r.chat).map((r) => r.label)
+    options: rows.filter((r) => !r.free && !r.chat).map((r) => r.label),
+    multi: rows.some((r) => r.checked !== null),
+    submit
   };
 }
+function focusedRow(paneText2) {
+  const lines2 = paneText2.split("\n").map((l) => l.trimEnd());
+  for (let i = lines2.length - 1; i >= 0; i--) {
+    const m = /^\s*[❯>›]\s*(\d{1,2})\.\s+\S/.exec(lines2[i] ?? "");
+    if (m) return Number(m[1]);
+  }
+  return null;
+}
 function readTabs(lines2) {
   for (let i = lines2.length - 1; i >= 0; i--) {
     const line = lines2[i] ?? "";
@@ -8206,15 +8437,17 @@ function readDialogScreen(paneText2) {
     options: d.options,
     notes: d.freeIndex === null && NOTES_FOOTER.test(lines2[footer] ?? ""),
     tabs,
-    title: readTitle(lines2, at, footer)
+    title: readTitle(lines2, at, footer),
+    multi: d.multi,
+    submit: d.submit
   };
 }
 function dialogKey(paneText2) {
   const s2 = readDialogScreen(paneText2);
   if (!s2) return "none";
   if (s2.kind === "review") return "review";
-  const tabs = s2.tabs.map((t) => `${t.answered ? "x" : "o"}${t.header}`).join(",");
-  return `q|${tabs}|${s2.title || s2.options.join("|")}`;
+  const tabs = s2.multi ? s2.tabs.map((t) => t.header).join(",") : s2.tabs.map((t) => `${t.answered ? "x" : "o"}${t.header}`).join(",");
+  return `q|${s2.multi ? "multi|" : ""}${tabs}|${s2.title || s2.options.join("|")}`;
 }
 function freeTextFilled(paneText2, n2) {
   const row = readChoiceDialog(paneText2)?.rows.find((r) => r.n === n2);
@@ -8233,6 +8466,42 @@ async function answerChoiceDialog(io, freeIndex, line, chunkMs) {
   io.enter();
   return true;
 }
+async function answerMultiSelectDialog(io, plan, chunkMs) {
+  const want = new Set(plan.pick);
+  const state = () => readChoiceDialog(io.capture());
+  for (const row of state()?.rows ?? []) {
+    if (row.checked === null || row.free || row.chat) continue;
+    if (row.checked === want.has(row.n)) continue;
+    io.literal(String(row.n));
+    await io.sleep(DIALOG_SETTLE_MS);
+    const after = state()?.rows.find((r) => r.n === row.n);
+    if (!after || after.checked !== want.has(row.n)) return false;
+  }
+  if (plan.line && plan.freeIndex !== null) {
+    let hop2 = 0;
+    while (focusedRow(io.capture()) !== plan.freeIndex && hop2 < NAV_TRIES) {
+      io.down();
+      await io.sleep(DIALOG_SETTLE_MS);
+      hop2++;
+    }
+    if (focusedRow(io.capture()) !== plan.freeIndex) return false;
+    for (const chunk of goalChunks(plan.line)) {
+      io.literal(chunk);
+      await io.sleep(chunkMs);
+    }
+    await io.sleep(DIALOG_SETTLE_MS);
+    if (!freeTextFilled(io.capture(), plan.freeIndex)) return false;
+  }
+  let hop = 0;
+  while (!state()?.submit.focused && hop < NAV_TRIES) {
+    io.down();
+    await io.sleep(DIALOG_SETTLE_MS);
+    hop++;
+  }
+  if (!state()?.submit.focused) return false;
+  io.enter();
+  return true;
+}
 function notesFilled(paneText2) {
   const lines2 = paneText2.split("\n").map((l) => l.trimEnd());
   for (let i = lines2.length - 1; i >= 0; i--) {
@@ -8263,7 +8532,7 @@ async function submitReview(io, submitRow) {
   }
   return false;
 }
-var FOOTER, ROW, PLACEHOLDER, CHAT_ROW, SIDE_PANEL, cleanLabel, REVIEW_PROMPT, SUBMIT_ROW, NOTES_FOOTER, TAB_BOX, lastIndexOf, RULE, DIALOG_SETTLE_MS, NOTES_PLACEHOLDER, NOTES_LINE, SUBMIT_TRIES;
+var FOOTER, ROW, PLACEHOLDER, CHAT_ROW, SIDE_PANEL, cleanLabel, CHECK, SUBMIT_BTN, REVIEW_PROMPT, SUBMIT_ROW, NOTES_FOOTER, TAB_BOX, lastIndexOf, RULE, DIALOG_SETTLE_MS, NAV_TRIES, NOTES_PLACEHOLDER, NOTES_LINE, SUBMIT_TRIES;
 var init_tui_dialog = __esm({
   "src/services/tui-dialog.ts"() {
     "use strict";
@@ -8274,6 +8543,8 @@ var init_tui_dialog = __esm({
     CHAT_ROW = /^chat about this$/i;
     SIDE_PANEL = /\s{2,}[│┃┌┐└┘├┤╭╮╰╯─━].*$/;
     cleanLabel = (s2) => s2.replace(SIDE_PANEL, "").trim();
+    CHECK = /^\[([ xX✔✓])\]\s*(.*)$/;
+    SUBMIT_BTN = /^\s*([❯>›])?\s{2,}(Submit|Next)\s*$/;
     REVIEW_PROMPT = /^\s*ready to submit your answers\?\s*$/i;
     SUBMIT_ROW = /^\s*[❯>›]?\s*(\d{1,2})\.\s+submit answers\s*$/i;
     NOTES_FOOTER = /\bn to add notes\b/i;
@@ -8284,6 +8555,7 @@ var init_tui_dialog = __esm({
     };
     RULE = /^[\s─━╌╍_=]*$/;
     DIALOG_SETTLE_MS = 250;
+    NAV_TRIES = 24;
     NOTES_PLACEHOLDER = /^(?:press n to add notes|add notes on this design(?:…|\.\.\.)?)$/i;
     NOTES_LINE = /(?:^|\s)Notes:\s*(.*)$/;
     SUBMIT_TRIES = 8;
@@ -8520,7 +8792,7 @@ function createSession(projectId, cwd, opts = {}) {
   if (existing && !existing.exited) return existing;
   if (existing) killSession(id);
   const agentForDefs = opts.agent ?? "claude";
-  const customDefs = opts.command ? [] : customAgentsFor(projectId);
+  const customDefs = opts.command ? [] : customAgentsFor(projectId, agentForDefs);
   const rosterBlock = agentForDefs === "codex" ? agentRosterBlock(customDefs) : "";
   let promptArg = "";
   if (!opts.command && opts.prompt) {
@@ -8665,7 +8937,7 @@ function capturePane(id, lines2 = 200) {
     return "";
   }
 }
-async function sendToPane(id, text, chunkMs = 50) {
+async function sendToPane(id, text, chunkMs = 50, choices = []) {
   const p = getSession(id);
   if (!p || p.exited) return false;
   const line = text.replace(/\s*\r?\n\s*/g, " ").trim();
@@ -8675,6 +8947,10 @@ async function sendToPane(id, text, chunkMs = 50) {
     const screen = readDialogScreen(io.capture());
     if (screen?.kind === "review") return await submitReview(io, screen.submitRow);
     if (screen?.kind === "question") {
+      if (screen.multi && screen.submit.present) {
+        const pick2 = resolveChoices(choices, screen.options).choices.map((c) => c.index);
+        return await answerMultiSelectDialog(io, { pick: pick2, line, freeIndex: screen.freeIndex }, chunkMs);
+      }
       if (screen.freeIndex !== null) return await answerChoiceDialog(io, screen.freeIndex, line, chunkMs);
       if (screen.notes) return await answerNotesDialog(io, line, chunkMs);
     }
@@ -8969,9 +9245,9 @@ var init_pty = __esm({
       }
     };
     customAgentSource = () => [];
-    customAgentsFor = (projectId) => {
+    customAgentsFor = (projectId, agent) => {
       try {
-        return customAgentSource(projectId);
+        return customAgentSource(projectId, agent);
       } catch {
         return [];
       }
@@ -8994,6 +9270,11 @@ var init_pty = __esm({
       enter: () => {
         tmux("send-keys", "-t", name(id), "Enter");
       },
+      // SPEC-485 · SATU panah per pemanggilan: terukur, empat `Down` dalam satu `send-keys` memindahkan
+      // fokus satu baris saja (jebakan burst ADR-0085, kali ini pada tombol kendali).
+      down: () => {
+        tmux("send-keys", "-t", name(id), "Down");
+      },
       sleep
     });
     DIALOG_CAPTURE_LINES = 60;
@@ -9273,7 +9554,10 @@ var init_sync = __esm({
       // ada: `upsert` yang tak menyebut kolom ber-default TETAP berhasil, jadi kolom yang terlewat
       // mendarat sebagai default palsu di tiap client tanpa satu pun error (kelas ADR-0090/0093).
       // `version` tak pernah masuk FIELDS — ia stempel mekanisme sync itu sendiri.
-      customAgent: ["projectId", "name", "description", "instructions", "tools", "model", "mentions", "enabled", "createdAt", "updatedAt"],
+      // SPEC-484 · ADR-0101 · `runtime` ikut: ia menentukan sesi mesin mana yang memakai persona ini,
+      // dan kolom yang terlewat di sini mendarat sebagai default palsu (= "warisi") di setiap mesin
+      // lain tanpa satu pun error.
+      customAgent: ["projectId", "name", "description", "instructions", "tools", "model", "mentions", "runtime", "enabled", "createdAt", "updatedAt"],
       // SPEC-471 · ADR-0095 · SELURUH kolom bermakna ikut. `status`/`specId` termasuk: keputusan
       // triase adalah bagian keadaan yang harus dilihat sama oleh semua mesin — tanpa itu satu
       // mesin bisa menerima ulang issue yang di mesin lain sudah jadi backlog.
@@ -9387,8 +9671,8 @@ var init_settings2 = __esm({
 // src/services/codex-trust.ts
 import { appendFileSync, mkdirSync as mkdirSync6, readFileSync as readFileSync5, realpathSync as realpathSync2 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
-function ensureCodexTrust(repoDir, home) {
-  const path = codexConfigPath(home);
+function ensureCodexTrust(repoDir, home2) {
+  const path = codexConfigPath(home2);
   let canonical = repoDir;
   try {
     canonical = realpathSync2(repoDir);
@@ -9402,7 +9686,7 @@ function ensureCodexTrust(repoDir, home) {
     } catch {
     }
     if (existing.includes(header2)) return;
-    mkdirSync6(codexHome(home), { recursive: true });
+    mkdirSync6(codexHome(home2), { recursive: true });
     const lead = existing === "" || existing.endsWith("\n") ? "" : "\n";
     appendFileSync(path, `${lead}
 ${header2}
@@ -9415,8 +9699,8 @@ var codexHome, codexConfigPath;
 var init_codex_trust = __esm({
   "src/services/codex-trust.ts"() {
     "use strict";
-    codexHome = (home) => home ?? process.env.CODEX_HOME ?? `${homedir2()}/.codex`;
-    codexConfigPath = (home) => `${codexHome(home)}/config.toml`;
+    codexHome = (home2) => home2 ?? process.env.CODEX_HOME ?? `${homedir2()}/.codex`;
+    codexConfigPath = (home2) => `${codexHome(home2)}/config.toml`;
   }
 });
 
@@ -9992,12 +10276,12 @@ ${input.text}`;
 });
 
 // src/services/telegram/store.ts
-import { Prisma } from "@prisma/client";
+import { Prisma as Prisma3 } from "@prisma/client";
 var isUnique, TelegramStore;
 var init_store = __esm({
   "src/services/telegram/store.ts"() {
     "use strict";
-    isUnique = (error) => error instanceof Prisma.PrismaClientKnownRequestError && error.code === "P2002";
+    isUnique = (error) => error instanceof Prisma3.PrismaClientKnownRequestError && error.code === "P2002";
     TelegramStore = class {
       // SPEC-481 · klien yang diekspor kini ber-extension (tap webhook) sehingga tak lagi
       // assignable ke `PrismaClient` polos. `Db` diturunkan dari nilai nyatanya.
@@ -14362,7 +14646,7 @@ function syncStatus() {
 async function startSyncClient(base2, token, tickMs2) {
   started = true;
   const transport = fetchTransport(base2, token);
-  const tick5 = async () => {
+  const tick6 = async () => {
     try {
       await syncOnce(transport);
     } catch {
@@ -14373,13 +14657,13 @@ async function startSyncClient(base2, token, tickMs2) {
     const wsUrl = base2.replace(/^http/, "ws").replace(/\/$/, "") + `/api/sync/ws?token=${encodeURIComponent(token)}`;
     ws = new WebSocket2(wsUrl);
     ws.on("open", () => {
-      void tick5();
+      void tick6();
     });
     ws.on("message", async (raw) => {
       try {
         const msg = JSON.parse(raw.toString());
         if (msg.t !== "sync") return;
-        if (!await applyFeedFrame(msg)) void tick5();
+        if (!await applyFeedFrame(msg)) void tick6();
       } catch {
       }
     });
@@ -14396,11 +14680,11 @@ async function startSyncClient(base2, token, tickMs2) {
       }
     });
   };
-  await tick5();
+  await tick6();
   void connectWs();
   const ms = tickMs2 && tickMs2 > 0 ? tickMs2 : 15e3;
   timer2 = setInterval(() => {
-    void tick5();
+    void tick6();
   }, ms);
   timer2.unref?.();
 }
@@ -17819,6 +18103,7 @@ init_src();
 
 // src/services/project-view.ts
 init_pty();
+init_src();
 var IDLE = { status: "idle", phase: null, flow: null };
 function sessionOf(projectId, sessions) {
   const s2 = sessions.find((x) => x.projectId === projectId && x.specId && !x.exited);
@@ -17858,7 +18143,9 @@ async function toProjectView(p, sessions) {
     // SPEC-294 · opt-in scheduler otonom (lokal per-instance).
     schedulerOptIn: p.schedulerOptIn,
     // SPEC-409 · ADR-0091 · opt-in hanoman-lead (lokal per-instance, cermin schedulerOptIn).
-    leadOptIn: p.leadOptIn
+    leadOptIn: p.leadOptIn,
+    // SPEC-486 · ADR-0103 · kebijakan auto-merge (lokal per-instance, cermin schedulerOptIn).
+    autoMerge: autoMergeOf(p.autoMerge)
   };
 }
 
@@ -17899,8 +18186,42 @@ async function branchFromCandidates(repoDir) {
   const [local, remote] = await Promise.all([listRepoBranches(repoDir), listRepoRemoteBranches(repoDir)]);
   return [.../* @__PURE__ */ new Set([...local, ...remote])].sort();
 }
+async function defaultBranch(repoDir) {
+  if (!repoDir) return null;
+  try {
+    const { stdout } = await exec2(
+      "git",
+      ["symbolic-ref", "--short", "refs/remotes/origin/HEAD"],
+      { cwd: repoDir, ...GIT }
+    );
+    const name2 = stdout.trim().replace(/^origin\//, "");
+    if (name2 && name2 !== "HEAD") return name2;
+  } catch {
+  }
+  const all = /* @__PURE__ */ new Set([...await listRepoBranches(repoDir), ...await listRepoRemoteBranches(repoDir)]);
+  for (const c of ["main", "master"]) if (all.has(c)) return c;
+  return null;
+}
+
+// src/services/auto-merge-gate.ts
+init_src();
+async function checkAutoMerge(repoDir, raw) {
+  if (raw === null || raw === void 0) return { ok: true };
+  const p = autoMergeOf(raw);
+  if (!p) return { ok: false, code: 400, error: "bentuk kebijakan auto-merge tak sah" };
+  if (p.mode === "off") return { ok: true };
+  if (!repoDir)
+    return { ok: false, code: 409, error: "project belum di-bind ke checkout lokal \u2014 atur repoDir dulu sebelum menyalakan auto-merge" };
+  if (p.mode === "default-branch") {
+    return await defaultBranch(repoDir) ? { ok: true } : { ok: false, code: 400, error: "default branch repo tak bisa diresolve (tak ada origin/HEAD, main, maupun master) \u2014 pilih branch tujuan secara eksplisit" };
+  }
+  if (!p.branch) return { ok: false, code: 400, error: 'mode "branch" butuh branch tujuan' };
+  const known = p.dest === "origin" ? await listRepoRemoteBranches(repoDir) : await listRepoBranches(repoDir);
+  return known.includes(p.branch) ? { ok: true } : { ok: false, code: 400, error: `branch "${p.branch}" tidak ada di ${p.dest === "origin" ? "origin" : "repo lokal"} project` };
+}
 
 // src/routes/projects.ts
+import { Prisma } from "@prisma/client";
 init_pty();
 
 // src/services/paginate.ts
@@ -17963,7 +18284,13 @@ async function projects_default(app2) {
     const parsed = zUpdateProject.safeParse(req.body);
     if (!parsed.success) return reply.code(400).send({ error: parsed.error.flatten() });
     if (!await prisma.project.findUnique({ where: { id } })) return reply.code(404).send({ error: "not found" });
-    const updated = await prisma.project.update({ where: { id }, data: parsed.data });
+    if ("autoMerge" in parsed.data) {
+      const gate = await checkAutoMerge(await resolveRepoDir(id), parsed.data.autoMerge);
+      if (!gate.ok) return reply.code(gate.code).send({ error: gate.error });
+    }
+    const data = { ...parsed.data };
+    if ("autoMerge" in data && data.autoMerge === null) data.autoMerge = Prisma.DbNull;
+    const updated = await prisma.project.update({ where: { id }, data });
     await notifySynced("project", id);
     return toProjectView(updated, listSessions());
   });
@@ -17995,7 +18322,11 @@ async function projects_default(app2) {
     const p = await prisma.project.findUnique({ where: { id } });
     if (!p) return reply.code(404).send({ error: "not found" });
     const repoDir = await resolveRepoDir(id);
-    return { branches: await listRepoBranches(repoDir), remotes: await listRepoRemoteBranches(repoDir) };
+    return {
+      branches: await listRepoBranches(repoDir),
+      remotes: await listRepoRemoteBranches(repoDir),
+      defaultBranch: await defaultBranch(repoDir)
+    };
   });
   app2.get("/projects/:id/help-center", async (req, reply) => {
     const { id } = req.params;
@@ -18121,6 +18452,9 @@ async function resolveGraphSource(repoDir, source) {
     if (await refExists(repoDir, cand)) return cand;
   return null;
 }
+async function discardMergeWorktree(repoDir, wt) {
+  await reclaim(repoDir, wt);
+}
 async function deleteMergedBranch(repoDir, branch) {
   await sh(repoDir, ["branch", "-D", "--end-of-options", branch]);
   if (await refExists(repoDir, `refs/remotes/origin/${branch}`))
@@ -18246,9 +18580,9 @@ async function revOk(wt, rev) {
   return exec4("git", ["rev-parse", "--verify", "-q", "--end-of-options", `${rev}^{commit}`], { cwd: wt, ...GIT3 }).then(() => true).catch(() => false);
 }
 async function mergeBase(wt, baseSha, branchFrom) {
-  const candidates = [baseSha, branchFrom, "main", "master"].filter((c) => !!c);
+  const candidates2 = [baseSha, branchFrom, "main", "master"].filter((c) => !!c);
   let base2 = "HEAD";
-  for (const c of candidates) if (await revOk(wt, c)) {
+  for (const c of candidates2) if (await revOk(wt, c)) {
     base2 = c;
     break;
   }
@@ -18641,6 +18975,9 @@ async function validateDependsOn(specId, projectId, raw) {
   return { ok: true, ids };
 }
 
+// src/routes/specs.ts
+import { Prisma as Prisma2 } from "@prisma/client";
+
 // src/services/doc-export.ts
 import PDFDocument from "pdfkit";
 
@@ -21065,6 +21402,13 @@ async function recordFailure(specId, title, projectId, reason) {
   }).catch(() => {
   });
 }
+async function recordAutoMerge(specId, projectId, title) {
+  const sessionId2 = specId.toLowerCase().replace(/[^a-z0-9_-]/g, "_");
+  await prisma.notification.create({
+    data: { type: "automerge", key: `automerge:${specId}`, specId, sessionId: sessionId2, title, projectId }
+  }).catch(() => {
+  });
+}
 async function recordNewTicket(ticketId, projectId, projectName, category, title) {
   const short = title.length > 80 ? title.slice(0, 77) + "\u2026" : title;
   const t = `Keluhan baru di "${projectName}": ${category}: ${short}`;
@@ -21274,7 +21618,7 @@ ${item.context}` : item.context;
     if (!parsed.success) return reply.code(400).send({ error: parsed.error.flatten() });
     const spec = await prisma.spec.findUnique({ where: { id } });
     if (!spec) return reply.code(404).send({ error: "not found" });
-    const { branchFrom, stage, confirmDelete, title, priority: newPriority, payload, dependsOn } = parsed.data;
+    const { branchFrom, stage, confirmDelete, title, priority: newPriority, payload, dependsOn, autoMerge } = parsed.data;
     const editingContent = title !== void 0 || newPriority !== void 0 || payload !== void 0;
     if (editingContent && (spec.stage !== "brainstorming" || spec.baseSha !== null))
       return reply.code(409).send({ error: "backlog item sudah dimulai \u2014 tak bisa diedit" });
@@ -21288,6 +21632,10 @@ ${item.context}` : item.context;
       if (!d.ok) return reply.code(400).send({ error: d.error });
       depIds = d.ids;
     }
+    if ("autoMerge" in parsed.data) {
+      const gate = await checkAutoMerge(await resolveRepoDir(spec.projectId), autoMerge);
+      if (!gate.ok) return reply.code(gate.code).send({ error: gate.error });
+    }
     if (stage !== void 0) {
       if (STAGES.indexOf(stage) >= STAGES.indexOf(spec.stage))
         return reply.code(422).send({ error: "stage hanya boleh dikembalikan mundur" });
@@ -21300,6 +21648,7 @@ ${item.context}` : item.context;
     const data = {};
     if (branchFrom !== void 0) data.branchFrom = branchFrom;
     if (depIds !== void 0) data.dependsOn = depIds;
+    if ("autoMerge" in parsed.data) data.autoMerge = autoMerge === null ? Prisma2.DbNull : autoMerge;
     if (stage !== void 0) data.stage = stage;
     if (editingContent) {
       const effPayload = payload ?? spec.payload;
@@ -23202,9 +23551,9 @@ function sshExec(t, remoteCmd, opts = {}) {
   return new Promise((resolve14) => {
     const p = spawn3(sshBin(), args, { stdio: ["pipe", "pipe", "pipe"], env });
     let out3 = "";
-    const timer6 = setTimeout(() => p.kill("SIGKILL"), opts.timeoutMs ?? 6e4);
+    const timer7 = setTimeout(() => p.kill("SIGKILL"), opts.timeoutMs ?? 6e4);
     const done = (r) => {
-      clearTimeout(timer6);
+      clearTimeout(timer7);
       if (askpass) rmSync4(dirname10(askpass), { recursive: true, force: true });
       resolve14(r);
     };
@@ -25322,6 +25671,16 @@ function leadPrompt(q, c) {
     }
     lines2.push("");
   }
+  if (c.chainSteps?.length) {
+    lines2.push("## Rantai keputusan ini (langkah yang sudah dijawab)");
+    for (const [i, s2] of c.chainSteps.entries()) {
+      lines2.push(`${i + 1}. "${s2.question.slice(0, 200)}" \u2192 ${s2.picked.length ? s2.picked.join("; ") : "(tanpa pilihan)"}`);
+      if (s2.options.length) lines2.push(`   opsi saat itu: ${s2.options.map((o) => o.slice(0, 80)).join(" \xB7 ")}`);
+    }
+    lines2.push("");
+    lines2.push("Pertanyaan di bawah adalah lanjutan dari rantai itu. Jangan bertentangan dengan yang sudah kamu putuskan di atas, dan jangan mengulang penjelasannya.");
+    lines2.push("");
+  }
   lines2.push("## Yang harus kamu putuskan");
   lines2.push(q.question.trim());
   if (q.options?.length) {
@@ -25329,7 +25688,12 @@ function leadPrompt(q, c) {
     lines2.push("Opsi yang dilihat peminta:");
     for (const [i, o] of q.options.entries()) lines2.push(`${i + 1}. ${o}`);
     lines2.push("");
-    lines2.push('Salah satu dari daftar itu WAJIB kamu pilih lewat field `choice` \u2014 isi nomornya ("2") atau labelnya persis. Pilihan di luar daftar ditolak server, dicatat sebagai penolakan, dan peminta kembali menunggu manusia.');
+    if (c.select?.mode === "multi") {
+      lines2.push(`Opsinya TIDAK saling eksklusif. Isi \`choices\` dengan daftar nomor atau label yang kamu pilih (mis. ["1","3"]) \u2014 paling sedikit ${c.select.min}, paling banyak ${c.select.max}. Jumlah di luar itu membuat SELURUH pilihanmu dibatalkan, bukan dipangkas.`);
+    } else {
+      lines2.push('Salah satu dari daftar itu WAJIB kamu pilih lewat field `choice` \u2014 isi nomornya ("2") atau labelnya persis.');
+    }
+    lines2.push("Pilihan di luar daftar ditolak server, dicatat sebagai penolakan, dan peminta kembali menunggu manusia.");
   }
   lines2.push("");
   lines2.push("## Batas waktu (BACA INI DULU)");
@@ -25356,6 +25720,7 @@ function leadPrompt(q, c) {
   lines2.push(JSON.stringify({
     decision: "keputusan yang dipilih, satu kalimat",
     choice: "nomor atau label opsi yang kamu pilih; kosongkan bila tak ada daftar opsi",
+    choices: [],
     reason: "alasannya, dua-tiga kalimat, menyebut bukti",
     refs: ["internal/docs/\u2026", "ADR-00xx"],
     confidence: "tinggi | sedang | ragu",
@@ -25414,6 +25779,7 @@ function keepExistingRefs(refs2, repoDir) {
 
 // src/services/lead/trail.ts
 init_db();
+init_src();
 async function recordDecision(i) {
   return prisma.leadDecision.create({
     data: {
@@ -25436,6 +25802,11 @@ async function recordDecision(i) {
       // null eksplisit, sementara "tak disebut" pada create sudah berarti NULL di baris barunya.
       options: i.options?.length ? i.options : void 0,
       missing: i.missing?.length ? i.missing : void 0,
+      // SPEC-485 · daftar kosong disimpan NULL dengan alasan yang sama seperti `options` di atas.
+      choices: i.choices?.length ? i.choices : void 0,
+      select: i.select ?? void 0,
+      flowId: i.flowId ?? null,
+      step: i.step ?? null,
       status: i.status ?? "berlaku",
       weighty: i.weighty ?? false,
       actor: i.actor ?? "lead"
@@ -25448,16 +25819,21 @@ async function listDecisions(f = {}) {
       ...f.projectId ? { projectId: f.projectId } : {},
       ...f.specId ? { specId: f.specId } : {},
       ...f.sessionId ? { sessionId: f.sessionId } : {},
+      ...f.flowId ? { flowId: f.flowId } : {},
       ...f.status ? { status: f.status } : {}
     },
-    orderBy: { createdAt: "desc" },
+    // SPEC-485 · satu RANTAI dibaca dari awal: urutan pertanyaannya adalah isi jejaknya. Daftar
+    // umum tetap terbaru-dulu (AC-24) — dua pertanyaan yang berbeda, dua urutan yang berbeda.
+    orderBy: { createdAt: f.flowId ? "asc" : "desc" },
     take: Math.min(f.take ?? 50, 200),
     skip: f.skip ?? 0
   });
 }
-async function overrideDecision(id, answer, reason) {
+async function overrideDecision(id, answer, reason, rawChoices = []) {
   const old = await prisma.leadDecision.findUnique({ where: { id } });
   if (!old || old.status !== "berlaku") return null;
+  const options2 = Array.isArray(old.options) ? old.options.map(String) : [];
+  const { choices } = resolveChoices(rawChoices, options2);
   const next = await recordDecision({
     projectId: old.projectId,
     specId: old.specId,
@@ -25470,7 +25846,14 @@ async function overrideDecision(id, answer, reason) {
     refs: [],
     confidence: "tinggi",
     action: "none",
-    actor: "operator"
+    actor: "operator",
+    choices,
+    choice: choices[0]?.option ?? null,
+    choiceIndex: choices[0]?.index ?? null,
+    options: options2,
+    select: old.select,
+    flowId: old.flowId,
+    step: old.step
   });
   const updated = await prisma.leadDecision.update({
     where: { id },
@@ -25502,6 +25885,13 @@ function toDecisionView(r) {
     choiceIndex: r.choiceIndex,
     options: Array.isArray(r.options) ? r.options.map(String) : [],
     missing: Array.isArray(r.missing) ? r.missing.map(String) : [],
+    // SPEC-485 · ADR-0102 · jawaban SELALU daftar di permukaan baca. Baris pra-migrasi tak punya
+    // kolomnya, jadi ia DITURUNKAN dari pasangan skalar lama — itulah yang membuat riwayat lama
+    // tetap terbaca sesudah perubahan skema, tanpa satu pun backfill.
+    choices: Array.isArray(r.choices) ? r.choices.map((c) => ({ index: Number(c?.index ?? 0) || 1, option: String(c?.option ?? "") })).filter((c) => c.option !== "") : r.choice ? [{ index: r.choiceIndex ?? 1, option: r.choice }] : [],
+    select: r.select ?? null,
+    flowId: r.flowId,
+    step: r.step,
     status: r.status,
     weighty: r.weighty,
     supersededById: r.supersededById,
@@ -25629,6 +26019,98 @@ async function runPool(items, limit, fn) {
   await Promise.all(Array.from({ length: workers }, worker));
 }
 
+// src/services/lead/flow.ts
+init_src();
+init_db();
+var LeadFlowClosedError = class extends Error {
+  constructor(flowId, flowStatus) {
+    super(`rantai keputusan ${flowId} sudah ${flowStatus === "tak-ada" ? "tidak ada" : flowStatus}`);
+    this.flowId = flowId;
+    this.flowStatus = flowStatus;
+    this.name = "LeadFlowClosedError";
+  }
+};
+var isOpen = (s2) => LEAD_FLOW_OPEN.includes(s2);
+var flowTitle = (q) => q.replace(/\s+/g, " ").trim().slice(0, 200);
+async function openFlow(i) {
+  return prisma.leadFlow.create({
+    data: {
+      projectId: i.projectId,
+      specId: i.specId ?? null,
+      sessionId: i.sessionId ?? null,
+      gate: i.gate,
+      title: flowTitle(i.title),
+      expiresAt: new Date(Date.now() + Math.max(1, i.ttlMin) * 6e4)
+    }
+  });
+}
+async function joinFlow(id) {
+  const row = await prisma.leadFlow.findUnique({ where: { id } });
+  if (!row) throw new LeadFlowClosedError(id, "tak-ada");
+  if (!isOpen(row.status)) throw new LeadFlowClosedError(id, row.status);
+  return row;
+}
+async function markFlowStep(id, answered) {
+  const row = await prisma.leadFlow.findUnique({ where: { id } });
+  if (!row || !isOpen(row.status)) return;
+  await prisma.leadFlow.update({
+    where: { id },
+    data: {
+      steps: { increment: 1 },
+      ...answered && row.status === "menunggu" ? { status: "sebagian" } : {}
+    }
+  });
+}
+async function closeFlow(id, reason) {
+  const row = await prisma.leadFlow.findUnique({ where: { id } });
+  if (!row || !isOpen(row.status)) return null;
+  const status = reason === "operator" || reason === "kedaluwarsa" ? "dibatalkan" : "selesai";
+  return prisma.leadFlow.update({
+    where: { id },
+    data: { status, closeReason: reason, closedAt: /* @__PURE__ */ new Date() }
+  });
+}
+async function listFlows(f = {}) {
+  return prisma.leadFlow.findMany({
+    where: {
+      ...f.projectId ? { projectId: f.projectId } : {},
+      ...f.status ? { status: f.status } : {}
+    },
+    orderBy: { createdAt: "desc" },
+    take: Math.min(f.take ?? 50, 200),
+    skip: f.skip ?? 0
+  });
+}
+async function expireFlows(now) {
+  const due = await prisma.leadFlow.findMany({
+    where: { status: { in: [...LEAD_FLOW_OPEN] }, expiresAt: { lt: now } },
+    orderBy: { createdAt: "asc" },
+    take: 100
+  });
+  const out3 = [];
+  for (const f of due) {
+    const closed = await closeFlow(f.id, "kedaluwarsa");
+    if (closed) out3.push(closed);
+  }
+  return out3;
+}
+function toFlowView(r) {
+  return {
+    id: r.id,
+    projectId: r.projectId,
+    specId: r.specId,
+    sessionId: r.sessionId,
+    gate: r.gate,
+    status: r.status,
+    title: r.title,
+    steps: r.steps,
+    closeReason: r.closeReason,
+    openedAt: r.openedAt.toISOString(),
+    closedAt: r.closedAt ? r.closedAt.toISOString() : null,
+    expiresAt: r.expiresAt.toISOString()
+  };
+}
+
 // src/services/lead/decide.ts
 var prodDecideDeps = {
   think,
@@ -25652,6 +26134,15 @@ var notifTitle = (kind, question, answer, confidence) => {
 async function decide(req, deps = prodDecideDeps) {
   const cfg = await getLead();
   if (!leadActive(cfg, req.projectId)) return null;
+  const flow = req.flowId ? await joinFlow(req.flowId) : await openFlow({
+    projectId: req.projectId,
+    specId: req.specId,
+    sessionId: req.sessionId,
+    gate: req.gate,
+    title: req.question,
+    ttlMin: cfg.flowTtlMin
+  });
+  const step = flow.steps + 1;
   const project = await prisma.project.findUnique({ where: { id: req.projectId }, select: { name: true } });
   const spec = req.specId ? await prisma.spec.findUnique({
     where: { id: req.specId },
@@ -25663,6 +26154,9 @@ async function decide(req, deps = prodDecideDeps) {
     orderBy: { createdAt: "desc" },
     take: 10
   });
+  const chainRows = req.flowId ? await prisma.leadDecision.findMany({ where: { flowId: flow.id }, orderBy: { createdAt: "asc" }, take: 10 }) : [];
+  const options2 = req.options ?? [];
+  const bounds = normalizeSelect(req.select ?? { mode: "single", min: 0, max: null }, options2.length);
   const ctx = {
     projectId: req.projectId,
     projectName: project?.name ?? req.projectId,
@@ -25679,7 +26173,13 @@ async function decide(req, deps = prodDecideDeps) {
       reason: d.reason,
       createdAt: d.createdAt.toISOString()
     })),
-    notes: req.notes
+    notes: req.notes,
+    select: bounds,
+    chainSteps: chainRows.map((d) => ({
+      question: d.question,
+      options: Array.isArray(d.options) ? d.options.map(String) : [],
+      picked: Array.isArray(d.choices) ? d.choices.map((c) => String(c?.option ?? "")).filter(Boolean) : d.choice ? [d.choice] : []
+    }))
   };
   const { agent, model, effort } = await deps.defaults();
   const prompt = leadPrompt({ kind: req.kind, question: req.question, options: req.options }, ctx);
@@ -25698,24 +26198,30 @@ async function decide(req, deps = prodDecideDeps) {
       }
     });
   } catch (e) {
-    if (e instanceof LeadBusyError) throw e;
-    return fail(req, deps, `lead tak menghasilkan keputusan: ${e.message}`);
+    if (e instanceof LeadBusyError) {
+      if (!req.flowId) await closeFlow(flow.id, "kedaluwarsa").catch(() => null);
+      throw e;
+    }
+    return closeAfter(await fail(req, deps, `lead tak menghasilkan keputusan: ${e.message}`, flow.id, step), flow.id, req.chain);
   } finally {
     if (req.sessionId) clearQueued(req.sessionId);
   }
   const verdict = parseLeadVerdict(raw);
-  if (!verdict) return fail(req, deps, "keluaran lead tak memuat blok json keputusan yang sah");
+  if (!verdict) return closeAfter(await fail(req, deps, "keluaran lead tak memuat blok json keputusan yang sah", flow.id, step), flow.id, req.chain);
   const refs2 = keepExistingRefs(verdict.refs, repoDir);
   const allowed = leadActionAllowed(verdict.action);
   const kind = allowed ? req.kind : "refusal";
-  const options2 = req.options ?? [];
-  const choice = resolveChoice(verdict.choice, options2);
-  const choiceRejected = options2.length > 0 && verdict.choice.trim() !== "" && !choice;
+  const rawChoices = verdict.choices.length ? verdict.choices : verdict.choice.trim() ? [verdict.choice] : [];
+  const resolved = resolveChoices(rawChoices, options2);
+  const countProblem = options2.length && resolved.choices.length ? checkChoiceCount(resolved.choices.length, bounds) : null;
+  const choices = countProblem ? [] : resolved.choices;
+  const choice = choices[0] ?? null;
+  const choiceRejected = options2.length > 0 && rawChoices.length > 0 && (resolved.rejected.length > 0 || !!countProblem);
   const missing = verdict.missing.map((m) => m.trim()).filter(Boolean);
   let action = allowed ? verdict.action : "none";
   let actionNote = "";
   let conflict = false;
-  if (allowed && choice) {
+  if (allowed && choices.length === 1 && choice) {
     const hint = optionActionHint(choice.option);
     if (hint && action === "none" && hint !== "none") {
       action = hint;
@@ -25729,7 +26235,10 @@ async function decide(req, deps = prodDecideDeps) {
   const confidence = missing.length ? "ragu" : verdict.confidence;
   const notes = [];
   if (!allowed) notes.push(`DITOLAK: ${leadRefusalReason(verdict.action)} berada di luar permukaan tindakan lead (ADR-0091 \xB7 AC-31/32).`);
-  if (choiceRejected) notes.push(`DITOLAK: pilihan "${verdict.choice.trim().slice(0, 120)}" tidak ada di daftar opsi yang dikirim peminta (SPEC-480 \xB7 ADR-0098).`);
+  if (options2.length && resolved.rejected.length)
+    notes.push(`DITOLAK: pilihan ${resolved.rejected.map((r) => `"${r.slice(0, 120)}"`).join(", ")} tidak ada di daftar opsi yang dikirim peminta (SPEC-480 \xB7 ADR-0098).`);
+  if (countProblem)
+    notes.push(`DITOLAK: ${countProblem} (SPEC-485 \xB7 ADR-0102) \u2014 seluruh pilihan dibatalkan, bukan dipangkas.`);
   if (actionNote) notes.push(actionNote);
   if (missing.length) notes.push(`KONTEKS KURANG: ${missing.join("; ")}`);
   const tail3 = notes.length ? `
@@ -25754,9 +26263,14 @@ ${notes.join("\n\n")}` : "";
     weighty,
     choice: choice?.option ?? null,
     choiceIndex: choice?.index ?? null,
+    choices,
+    select: bounds,
+    flowId: flow.id,
+    step,
     options: options2,
     missing
   });
+  await closeAfter(row, flow.id, req.chain);
   if (weighty) {
     await deps.notify(
       row.id,
@@ -25770,18 +26284,24 @@ ${notes.join("\n\n")}` : "";
     decision: clampProse(verdict.decision, LEAD_DECISION_MAX),
     reason: `${clampProse(verdict.reason, LEAD_REASON_MAX)}${tail3}`,
     reply: verdict.reply,
+    choices,
     choice,
     missing
   });
   return row;
 }
+async function closeAfter(row, flowId, chain) {
+  await markFlowStep(flowId, row.status === "berlaku");
+  if (!chain) await closeFlow(flowId, "tunggal");
+  return row;
+}
 var lastDelivery = /* @__PURE__ */ new Map();
 function takeDelivery(decisionId) {
   const v = lastDelivery.get(decisionId) ?? null;
   lastDelivery.delete(decisionId);
   return v;
 }
-async function fail(req, deps, reason) {
+async function fail(req, deps, reason, flowId = null, step = null) {
   const prev = await prisma.leadDecision.findFirst({
     where: { projectId: req.projectId, gate: req.gate, kind: req.kind },
     orderBy: { createdAt: "desc" },
@@ -25799,6 +26319,10 @@ async function fail(req, deps, reason) {
     refs: [],
     confidence: "ragu",
     action: "none",
+    // SPEC-485 · langkah yang gagal tetap duduk di alurnya: alur yang seluruh langkahnya gagal
+    // harus tetap terbaca sebagai satu urusan, bukan sebagai baris yatim.
+    flowId,
+    step,
     status: "gagal",
     weighty: true
   });
@@ -26044,7 +26568,7 @@ var prodDetectDeps = {
       return true;
     }
   },
-  send: (id, text) => sendToPane(id, text),
+  send: (id, text, choices) => sendToPane(id, text, 50, choices),
   clearMarker: (file) => {
     try {
       writeFileSync5(file, "");
@@ -26208,7 +26732,8 @@ async function runChain(s2, agent, deps) {
       return { acted, done: false, failed: true, reason: "lead tak menghasilkan keputusan yang berlaku" };
     const sent = deps.delivery(row.id);
     const reply = (sent ? leadReplyText(sent) : "") || row.answer;
-    if (!await deps.send(s2.id, reply))
+    const picked = sent?.choices.map((c) => c.option) ?? [];
+    if (!await deps.send(s2.id, reply, picked))
       return { acted, done: false, failed: true, reason: "gagal mengetik ke pane" };
     acted = true;
     if (!screen) return { acted, done: true, failed: false, reason: "" };
@@ -26531,6 +27056,21 @@ async function tick2(now, deps = {}) {
       busyDetect = false;
     }));
   }
+  jobs.push((async () => {
+    const expire = deps.expire ?? expireFlows;
+    const notify = deps.notify ?? recordLeadDecision;
+    for (const f of await expire(/* @__PURE__ */ new Date())) {
+      await notify(
+        f.id,
+        `Rantai keputusan lead ditutup karena kedaluwarsa: ${f.title.slice(0, 80)}`,
+        f.projectId,
+        f.specId,
+        f.sessionId
+      );
+    }
+  })().catch((e) => {
+    console.error("lead expire:", e);
+  }));
   if (!cfg.paused && !busyPulse && now - Math.max(lastPulseAt, pulseEndedAt) >= cfg.everyMin * 6e4) {
     busyPulse = true;
     lastPulseAt = now;
@@ -26618,11 +27158,35 @@ async function lead_default(app2) {
       specId: q.specId,
       sessionId: q.sessionId,
       status: q.status,
+      // SPEC-485 · satu rantai dibaca lewat filter ini, urut NAIK (lihat `listDecisions`).
+      flowId: q.flowId,
       take: q.take ? Number(q.take) : void 0,
       skip: q.skip ? Number(q.skip) : void 0
     });
     return { items: rows.map(toDecisionView) };
   });
+  app2.get("/lead/flows", async (req) => {
+    const q = req.query;
+    const rows = await listFlows({
+      projectId: q.projectId,
+      status: q.status,
+      take: q.take ? Number(q.take) : void 0,
+      skip: q.skip ? Number(q.skip) : void 0
+    });
+    return { items: rows.map(toFlowView) };
+  });
+  app2.post("/lead/flows/:id/submit", async (req, reply) => {
+    const { id } = req.params;
+    const row = await closeFlow(id, "submit");
+    if (!row) return reply.code(409).send({ error: "rantai tak ada atau sudah tertutup" });
+    return toFlowView(row);
+  });
+  app2.post("/lead/flows/:id/cancel", async (req, reply) => {
+    const { id } = req.params;
+    const row = await closeFlow(id, "operator");
+    if (!row) return reply.code(409).send({ error: "rantai tak ada atau sudah tertutup" });
+    return toFlowView(row);
+  });
   app2.post("/lead/decisions", async (req, reply) => {
     const parsed = zLeadAsk.safeParse(req.body);
     if (!parsed.success) return reply.code(400).send({ error: parsed.error.flatten() });
@@ -26632,6 +27196,15 @@ async function lead_default(app2) {
     const cfg = await getLead();
     if (!project.leadOptIn || !leadActive(cfg, ask.projectId))
       return reply.code(409).send({ error: "lead tidak aktif untuk project ini" });
+    const optionCount = ask.options.length;
+    if (ask.select.mode === "multi" && optionCount === 0)
+      return reply.code(400).send({ error: "select.mode `multi` menuntut daftar `options`" });
+    if (ask.select.max !== null && ask.select.min > ask.select.max)
+      return reply.code(400).send({ error: "select.min melebihi select.max" });
+    if (ask.select.max !== null && optionCount > 0 && ask.select.max > optionCount)
+      return reply.code(400).send({ error: `select.max (${ask.select.max}) melebihi jumlah opsi (${optionCount})` });
+    if (ask.select.min > optionCount)
+      return reply.code(400).send({ error: `select.min (${ask.select.min}) melebihi jumlah opsi (${optionCount})` });
     let row;
     try {
       row = await decide({
@@ -26642,9 +27215,13 @@ async function lead_default(app2) {
         kind: "answer",
         question: ask.question,
         options: ask.options,
-        notes: ask.context ? [ask.context] : void 0
+        notes: ask.context ? [ask.context] : void 0,
+        select: ask.select,
+        chain: ask.chain,
+        flowId: ask.flowId ?? null
       });
     } catch (e) {
+      if (e instanceof LeadFlowClosedError) return reply.code(409).send({ error: e.message });
       if (!(e instanceof LeadBusyError)) throw e;
       return reply.code(503).header("retry-after", String(Math.max(5, cfg.queueWaitSec))).send({ error: e.message, retryable: true, queued: e.queued });
     }
@@ -26657,6 +27234,7 @@ async function lead_default(app2) {
       } catch {
       }
     }
+    const flowStatus = row.flowId ? (await prisma.leadFlow.findUnique({ where: { id: row.flowId }, select: { status: true } }))?.status ?? null : null;
     const answer = {
       id: row.id,
       decision: sent?.decision ?? row.answer,
@@ -26666,7 +27244,12 @@ async function lead_default(app2) {
       action: row.action,
       // Saluran pengiriman bisa meleset (baris lahir dari jalur lain); kolomnya yang selalu ada.
       choice: sent?.choice ?? (row.choice ? { index: row.choiceIndex ?? 1, option: row.choice } : null),
-      missing: sent?.missing ?? (Array.isArray(row.missing) ? row.missing.map(String) : [])
+      missing: sent?.missing ?? (Array.isArray(row.missing) ? row.missing.map(String) : []),
+      // SPEC-485 · `choices` bentuk yang berlaku; `toDecisionView` sudah tahu cara menurunkannya
+      // dari kolom lama, jadi pemetaannya tak diduplikasi di sini (kelas bug SPEC-431/448/475).
+      choices: sent?.choices ?? toDecisionView(row).choices,
+      flowId: row.flowId,
+      flowStatus
     };
     return reply.code(201).send(answer);
   });
@@ -26674,12 +27257,17 @@ async function lead_default(app2) {
     const { id } = req.params;
     const parsed = zLeadOverride.safeParse(req.body);
     if (!parsed.success) return reply.code(400).send({ error: parsed.error.flatten() });
-    const r = await overrideDecision(id, parsed.data.answer, parsed.data.reason);
+    const r = await overrideDecision(id, parsed.data.answer, parsed.data.reason, parsed.data.choices);
     if (!r) return reply.code(409).send({ error: "keputusan tak ada atau sudah tak berlaku" });
     let delivered = false;
     if (r.next.sessionId) {
       resetSession(r.next.sessionId);
-      delivered = await sendToPane(r.next.sessionId, parsed.data.answer).catch(() => false);
+      delivered = await sendToPane(
+        r.next.sessionId,
+        parsed.data.answer,
+        50,
+        toDecisionView(r.next).choices.map((c) => c.option)
+      ).catch(() => false);
     }
     return { old: toDecisionView(r.old), next: toDecisionView(r.next), delivered };
   });
@@ -26696,11 +27284,61 @@ async function lead_default(app2) {
 init_src();
 init_db();
 
+// src/services/agent-tool-catalog.ts
+init_src();
+import { readFileSync as readFileSync12 } from "node:fs";
+import { homedir as homedir8 } from "node:os";
+import { join as join15 } from "node:path";
+var home = () => process.env.HOME || homedir8();
+var readJson = (path) => {
+  try {
+    return JSON.parse(readFileSync12(path, "utf8"));
+  } catch {
+    return null;
+  }
+};
+var serversOf = (node) => {
+  const ms = node?.mcpServers;
+  if (!ms || typeof ms !== "object" || Array.isArray(ms)) return [];
+  return Object.keys(ms);
+};
+var codexServers = () => {
+  let text;
+  try {
+    text = readFileSync12(join15(home(), ".codex", "config.toml"), "utf8");
+  } catch {
+    return [];
+  }
+  const out3 = [];
+  for (const m of text.matchAll(/^\s*\[mcp_servers\.(?:"([^"]+)"|([A-Za-z0-9_-]+))(?:\.[^\]]*)?\]/gm)) {
+    const name2 = m[1] ?? m[2];
+    if (name2) out3.push(name2);
+  }
+  return out3;
+};
+function mcpServerNames(repoDir) {
+  const names = [];
+  const claudeJson = readJson(join15(home(), ".claude.json"));
+  names.push(...serversOf(claudeJson));
+  if (repoDir) {
+    const projects = claudeJson?.projects;
+    if (projects && typeof projects === "object") names.push(...serversOf(projects[repoDir]));
+    names.push(...serversOf(readJson(join15(repoDir, ".mcp.json"))));
+  }
+  names.push(...codexServers());
+  return [...new Set(names.filter(Boolean))].sort((a, b) => a.localeCompare(b));
+}
+function agentToolCatalog(repoDir) {
+  return [ALL_TOOLS_ENTRY, ...BUILTIN_AGENT_TOOLS, ...mcpServerNames(repoDir).map(mcpToolEntry)];
+}
+var agentToolIds = (repoDir) => agentToolCatalog(repoDir).map((t) => t.id);
+
 // src/services/custom-agents.ts
 init_db();
 init_src();
 init_pty();
 var cache4 = [];
+var repoDirCache = /* @__PURE__ */ new Map();
 var asCustomAgent = (r) => ({
   id: r.id,
   projectId: r.projectId,
@@ -26710,6 +27348,7 @@ var asCustomAgent = (r) => ({
   tools: toolsOf(r.tools),
   model: r.model,
   mentions: mentionsOf(r.mentions),
+  runtime: runtimeOf(r.runtime),
   enabled: r.enabled,
   createdAt: "",
   updatedAt: ""
@@ -26718,18 +27357,31 @@ var asCustomAgent = (r) => ({
 async function loadCustomAgents() {
   try {
     cache4 = await prisma.customAgent.findMany();
+    const projects = await prisma.project.findMany({ select: { id: true, repoDir: true } });
+    const bindings = await prisma.localBinding.findMany({ select: { projectId: true, repoDir: true } });
+    const next = /* @__PURE__ */ new Map();
+    for (const p of projects) next.set(p.id, p.repoDir ?? null);
+    for (const b of bindings) next.set(b.projectId, b.repoDir ?? null);
+    repoDirCache = next;
   } catch {
     cache4 = [];
+    repoDirCache = /* @__PURE__ */ new Map();
   }
 }
-function agentDefsFor(projectId) {
+function agentDefsFor(projectId, agent) {
   const globals = cache4.filter((r) => r.projectId === null).map(asCustomAgent);
   const project = cache4.filter((r) => r.projectId === projectId).map(asCustomAgent);
-  return effectiveAgents(globals, project).map((a) => ({
+  const eff = effectiveAgents(globals, project).filter((a) => a.runtime === null || a.runtime === agent);
+  const needsCatalog = eff.some((a) => (a.tools ?? []).includes(ALL_TOOLS));
+  const catalogIds = needsCatalog ? agentToolIds(repoDirCache.get(projectId) ?? null) : [];
+  return eff.map((a) => ({
     name: a.name,
     description: a.description,
     instructions: a.instructions,
-    tools: a.tools,
+    // Ekspansi terjadi DI SINI, sebelum `resolveTools` di runner: meneruskan `"*"` apa adanya
+    // membuat claude membuangnya senyap (agen tanpa alat), sementara menerjemahkannya jadi `null`
+    // membuat agen mewarisi SELURUH tool termasuk `Task` — lapis 2 anti-loop lenyap tanpa jejak.
+    tools: expandTools(a.tools, catalogIds),
     model: a.model,
     mentions: a.mentions ?? []
   }));
@@ -26753,7 +27405,7 @@ function unknownMentions(row, all) {
 }
 async function installCustomAgents() {
   await loadCustomAgents();
-  registerCustomAgentSource((projectId) => agentDefsFor(projectId));
+  registerCustomAgentSource((projectId, agent) => agentDefsFor(projectId, agent));
 }
 
 // src/routes/custom-agents.ts
@@ -26767,10 +27419,33 @@ var view6 = (r, projectId) => ({
   tools: toolsOf(r.tools),
   model: r.model,
   mentions: mentionsOf(r.mentions),
+  runtime: runtimeOf(r.runtime),
   enabled: r.enabled,
   ...projectId ? { inherited: r.projectId === null } : {}
 });
+var repoDirOf2 = async (projectId) => projectId ? await resolveRepoDir(projectId) : null;
+function toolsProblem(tools, catalogIds) {
+  if (!tools || tools.length === 0) return null;
+  if (tools.includes(ALL_TOOLS) && tools.length > 1) {
+    return { error: "pintasan * harus jadi satu-satunya pilihan tools", unknownTools: [] };
+  }
+  const unknownTools = tools.filter((t) => !catalogIds.includes(t));
+  return unknownTools.length ? { error: "tool tak dikenal di mesin ini", unknownTools } : null;
+}
+function modelProblem(model, runtime) {
+  if (!model) return null;
+  const ok2 = modelsForRuntime(runtime).some((m) => m.id === model);
+  return ok2 ? null : { error: "model tak dikenal untuk runtime ini", model, runtime };
+}
 async function custom_agents_default(app2) {
+  app2.get("/custom-agents/catalog", async (req) => {
+    const projectId = req.query.projectId;
+    return {
+      tools: agentToolCatalog(await repoDirOf2(projectId)),
+      models: modelsForRuntime(null),
+      runtimes: AGENT_RUNTIMES.map((id) => ({ id, label: AGENT_RUNTIME_LABELS[id] }))
+    };
+  });
   app2.get("/custom-agents", async (req) => {
     const projectId = req.query.projectId;
     const rows = await prisma.customAgent.findMany({
@@ -26789,6 +27464,10 @@ async function custom_agents_default(app2) {
     const projectId = p.projectId ?? null;
     if (projectId && !await prisma.project.findUnique({ where: { id: projectId } }))
       return reply.code(400).send({ error: "project tak ditemukan", projectId });
+    const tp = toolsProblem(p.tools ?? null, agentToolIds(await repoDirOf2(projectId)));
+    if (tp) return reply.code(400).send(tp);
+    const mp = modelProblem(p.model ?? null, p.runtime ?? null);
+    if (mp) return reply.code(400).send(mp);
     const id = customAgentId(projectId, p.name);
     if (await prisma.customAgent.findUnique({ where: { id } }))
       return reply.code(409).send({ error: "nama sudah dipakai di scope ini", id });
@@ -26801,6 +27480,7 @@ async function custom_agents_default(app2) {
       tools: p.tools ?? null,
       model: p.model ?? null,
       mentions: p.mentions ?? [],
+      runtime: p.runtime ?? null,
       enabled: p.enabled ?? true
     };
     const all = [...await rowsOf(), candidate];
@@ -26817,6 +27497,7 @@ async function custom_agents_default(app2) {
       tools: candidate.tools,
       model: candidate.model,
       mentions: candidate.mentions,
+      runtime: candidate.runtime,
       enabled: candidate.enabled
     } });
     await loadCustomAgents();
@@ -26833,11 +27514,24 @@ async function custom_agents_default(app2) {
     const existing = await prisma.customAgent.findUnique({ where: { id } });
     if (!existing) return reply.code(404).send({ error: "not found" });
     const before = existing;
+    const effRuntime = "runtime" in parsed.data ? parsed.data.runtime ?? null : runtimeOf(before.runtime);
+    if (parsed.data.tools !== void 0) {
+      const tp = toolsProblem(parsed.data.tools, agentToolIds(await repoDirOf2(before.projectId)));
+      if (tp) return reply.code(400).send(tp);
+    }
+    if (parsed.data.model !== void 0 || "runtime" in parsed.data) {
+      const mp = modelProblem(
+        parsed.data.model !== void 0 ? parsed.data.model : before.model,
+        effRuntime
+      );
+      if (mp) return reply.code(400).send(mp);
+    }
     const candidate = {
       ...before,
       ...parsed.data,
       mentions: parsed.data.mentions ?? mentionsOf(before.mentions),
-      tools: parsed.data.tools !== void 0 ? parsed.data.tools : toolsOf(before.tools)
+      tools: parsed.data.tools !== void 0 ? parsed.data.tools : toolsOf(before.tools),
+      runtime: effRuntime
     };
     const all = (await rowsOf()).map((r) => r.id === id ? candidate : r);
     const unknown = unknownMentions(candidate, all);
@@ -26850,6 +27544,7 @@ async function custom_agents_default(app2) {
       tools: candidate.tools,
       model: candidate.model,
       mentions: candidate.mentions,
+      runtime: candidate.runtime,
       enabled: candidate.enabled
     } });
     await loadCustomAgents();
@@ -26900,24 +27595,24 @@ function githubSlugFromUrl(url2) {
 async function resolveGithubRepo(projectId) {
   const project = await prisma.project.findUnique({ where: { id: projectId } });
   if (!project) return { ok: false, kind: "no-project", error: `project "${projectId}" tidak ada` };
-  const candidates = [];
-  if (project.gitRemote) candidates.push(project.gitRemote);
+  const candidates2 = [];
+  if (project.gitRemote) candidates2.push(project.gitRemote);
   const repoDir = await resolveRepoDir(projectId).catch(() => null);
   if (repoDir) {
     const origin = (await listRemotes(repoDir)).find((r) => r.name === "origin");
-    if (origin?.fetch) candidates.push(origin.fetch);
+    if (origin?.fetch) candidates2.push(origin.fetch);
   }
-  if (candidates.length === 0)
+  if (candidates2.length === 0)
     return {
       ok: false,
       kind: "no-remote",
       error: "project belum punya remote GitHub (isi gitRemote atau tambahkan origin di repo lokalnya)"
     };
-  for (const url2 of candidates) {
+  for (const url2 of candidates2) {
     const gh = githubSlugFromUrl(url2);
     if (gh) return { ok: true, repo: gh };
   }
-  const host2 = parse2(candidates[0])?.host ?? candidates[0];
+  const host2 = parse2(candidates2[0])?.host ?? candidates2[0];
   return {
     ok: false,
     kind: "not-github",
@@ -27349,7 +28044,7 @@ async function testTelegramConnection(deps = {}) {
   }
   const timeoutMs = deps.timeoutMs ?? 1e4;
   const controller = new AbortController();
-  const timer6 = setTimeout(() => controller.abort(), timeoutMs);
+  const timer7 = setTimeout(() => controller.abort(), timeoutMs);
   const send = deps.transport ?? ((url2, init) => fetch(url2, init));
   const transport = (url2, init) => send(url2, { ...init, signal: controller.signal });
   const client = new TelegramApiClient(botToken, transport);
@@ -27363,7 +28058,7 @@ async function testTelegramConnection(deps = {}) {
     const message = controller.signal.aborted ? `Timeout ${timeoutMs} ms \u2014 Telegram tidak menjawab.` : raw;
     return { ok: false, error: sanitizeTelegramOutput(message, [botToken]).slice(0, 500) };
   } finally {
-    clearTimeout(timer6);
+    clearTimeout(timer7);
   }
 }
 function resolveTestChatId() {
@@ -27669,7 +28364,7 @@ async function sendOnce(o, deps = {}) {
     nowSec: o.nowSec ?? Math.floor(Date.now() / 1e3)
   });
   const ac = new AbortController();
-  const timer6 = setTimeout(() => ac.abort(), WEBHOOK_TIMEOUT_MS);
+  const timer7 = setTimeout(() => ac.abort(), WEBHOOK_TIMEOUT_MS);
   try {
     const f = deps.fetcher ?? ((u, init) => fetch(u, init));
     const res = await f(parsed.url.toString(), { method: "POST", headers, body: o.body, signal: ac.signal });
@@ -27683,7 +28378,7 @@ async function sendOnce(o, deps = {}) {
     const msg = e.name === "AbortError" ? `timeout ${WEBHOOK_TIMEOUT_MS} ms` : e.message;
     return fail2(msg);
   } finally {
-    clearTimeout(timer6);
+    clearTimeout(timer7);
   }
 }
 
@@ -28885,6 +29580,120 @@ function startWebhookEngine() {
   }).catch((e) => console.error("webhook reset:", e));
 }
 
+// src/services/auto-merge.ts
+init_src();
+init_db();
+import { execFile as execFile11 } from "node:child_process";
+import { promisify as promisify10 } from "node:util";
+var AUTO_MERGE_WINDOW_MS = 24 * 60 * 60 * 1e3;
+var AUTO_MERGE_GRACE_MS = 15 * 60 * 1e3;
+var TICK_MS4 = 6e4;
+var exec8 = promisify10(execFile11);
+var GIT7 = { timeout: 3e4, maxBuffer: 1 << 24, encoding: "utf8" };
+var gitOut = async (cwd, args) => {
+  try {
+    return (await exec8("git", args, { cwd, ...GIT7 })).stdout.trim();
+  } catch {
+    return null;
+  }
+};
+var prodAutoMergeDeps = {
+  repoDir: resolveRepoDir,
+  defaultBranch,
+  // Tanpa `fetch`: `git push` dari worktree repo yang sama memperbarui remote-tracking ref
+  // di repo itu juga, jadi origin/<branch> sudah mutakhir tepat setelah sesi mem-push.
+  sourceTip: async (repoDir, branch) => await gitOut(repoDir, ["rev-parse", "--verify", "-q", "--end-of-options", `refs/remotes/origin/${branch}^{commit}`]) ?? await gitOut(repoDir, ["rev-parse", "--verify", "-q", "--end-of-options", `refs/heads/${branch}^{commit}`]),
+  // `merge-base --is-ancestor` keluar 0/1 tanpa output → "" saat benar, null saat salah/galat.
+  contains: async (repoDir, tip, sha) => await gitOut(repoDir, ["merge-base", "--is-ancestor", "--end-of-options", sha, tip]) !== null,
+  integrate,
+  discardWorktree: discardMergeWorktree,
+  deleteBranch: deleteMergedBranch
+};
+async function candidates(now) {
+  const since = new Date(now.getTime() - AUTO_MERGE_WINDOW_MS);
+  const done = await prisma.notification.findMany({
+    where: { type: "done", createdAt: { gte: since }, specId: { not: null } },
+    select: { specId: true, projectId: true, createdAt: true }
+  });
+  if (!done.length) return [];
+  const keys = done.map((d) => `automerge:${d.specId}`);
+  const marked2 = new Set(
+    (await prisma.notification.findMany({ where: { key: { in: keys } }, select: { key: true } })).map((n2) => n2.key)
+  );
+  return done.filter((d) => !marked2.has(`automerge:${d.specId}`)).map((d) => ({ specId: d.specId, projectId: d.projectId ?? "", doneAt: d.createdAt }));
+}
+async function sweepAutoMerge(deps = prodAutoMergeDeps, now = /* @__PURE__ */ new Date()) {
+  const list2 = await candidates(now);
+  if (!list2.length) return 0;
+  let settled = 0;
+  for (const c of list2) {
+    try {
+      if (await settleOne(c, deps, now)) settled++;
+    } catch (e) {
+      console.error(`auto-merge ${c.specId}:`, e);
+    }
+  }
+  return settled;
+}
+async function settleOne(c, deps, now) {
+  const spec = await prisma.spec.findUnique({ where: { id: c.specId } });
+  if (!spec || spec.stage !== "done") return false;
+  const project = await prisma.project.findUnique({ where: { id: spec.projectId } });
+  if (!project) return false;
+  const policy = resolveAutoMerge(
+    project.autoMerge,
+    spec.autoMerge
+  );
+  if (policy.mode === "off") return false;
+  const report = (t) => recordAutoMerge(spec.id, spec.projectId, t).then(() => true);
+  const repoDir = await deps.repoDir(spec.projectId);
+  if (!repoDir)
+    return report(`Auto-merge ${spec.id} dilewati \u2014 project belum di-bind ke checkout lokal`);
+  const target2 = autoMergeTargetOf(
+    policy,
+    policy.mode === "default-branch" ? await deps.defaultBranch(repoDir) : null
+  );
+  if (!target2)
+    return report(`Auto-merge ${spec.id} dilewati \u2014 default branch repo tak bisa diresolve; pilih branch tujuan di Settings project`);
+  const branch = sourceBranch(spec.id);
+  const tip = await deps.sourceTip(repoDir, branch);
+  const ready = tip !== null && (spec.headSha === null || await deps.contains(repoDir, tip, spec.headSha));
+  if (!ready) {
+    if (now.getTime() - c.doneAt.getTime() <= AUTO_MERGE_GRACE_MS) return false;
+    return report(`Auto-merge ${spec.id} dilewati \u2014 branch kerja \`${branch}\` belum ter-push ke origin`);
+  }
+  const res = await deps.integrate(repoDir, spec.id, "merge", target2);
+  if (res.status === "clean") {
+    if (policy.deleteBranch) await deps.deleteBranch(repoDir, branch).catch(() => {
+    });
+    return report(`Auto-merge ${spec.id} \u2192 ${target2} bersih (${res.detail})`);
+  }
+  if (res.status === "conflict") {
+    await deps.discardWorktree(repoDir, res.worktree).catch(() => {
+    });
+    return report(`Auto-merge ${spec.id} \u2192 ${target2} GAGAL: konflik \u2014 branch kerja \`${branch}\` utuh, selesaikan lewat Rebase / Merge di backlog`);
+  }
+  return report(`Auto-merge ${spec.id} \u2192 ${target2} GAGAL: ${res.error}`);
+}
+var timer6;
+var busy3 = false;
+async function tick5() {
+  if (busy3) return;
+  busy3 = true;
+  try {
+    await sweepAutoMerge();
+  } catch (e) {
+    console.error("auto-merge sweep:", e);
+  } finally {
+    busy3 = false;
+  }
+}
+function startAutoMerge() {
+  if (timer6) return;
+  timer6 = setInterval(() => void tick5(), TICK_MS4);
+  timer6.unref();
+}
+
 // src/server.ts
 var app = buildApp();
 var port = Number(process.env.PORT ?? 8787);
@@ -28931,6 +29740,7 @@ app.listen({ port, host }).then(async () => {
   startScheduler();
   startLead();
   startWebhookEngine();
+  startAutoMerge();
 }).catch((err) => {
   console.error("listen gagal:", err);
   process.exit(1);