@nilsr0711/drydock 0.1.8 → 0.1.9

package/.next/standalone/mcp-server.cjs

@@ -8092,7 +8092,7 @@ var init_sql = __esm({
         return new SQL([new StringChunk(str)]);
       }
       sql2.raw = raw;
-      function join17(chunks, separator) {
+      function join18(chunks, separator) {
         const result = [];
         for (const [i, chunk] of chunks.entries()) {
           if (i > 0 && separator !== void 0) {
@@ -8102,7 +8102,7 @@ var init_sql = __esm({
         }
         return new SQL(result);
       }
-      sql2.join = join17;
+      sql2.join = join18;
       function identifier(value) {
         return new Name(value);
       }
@@ -11027,7 +11027,7 @@ var init_select2 = __esm({
           const baseTableName = this.tableName;
           const tableName = getTableLikeName(table);
           for (const item of extractUsedTable(table)) this.usedTables.add(item);
-          if (typeof tableName === "string" && this.config.joins?.some((join17) => join17.alias === tableName)) {
+          if (typeof tableName === "string" && this.config.joins?.some((join18) => join18.alias === tableName)) {
             throw new Error(`Alias "${tableName}" is already used in this query`);
           }
           if (!this.isPartialSelect) {
@@ -11917,7 +11917,7 @@ var init_update = __esm({
       createJoin(joinType) {
         return (table, on) => {
           const tableName = getTableLikeName(table);
-          if (typeof tableName === "string" && this.config.joins.some((join17) => join17.alias === tableName)) {
+          if (typeof tableName === "string" && this.config.joins.some((join18) => join18.alias === tableName)) {
             throw new Error(`Alias "${tableName}" is already used in this query`);
           }
           if (typeof on === "function") {
@@ -13463,6 +13463,12 @@ var init_schema = __esm({
       sandboxAllowNetwork: integer("sandbox_allow_network", { mode: "boolean" }).notNull().default(false),
       sandboxCpus: text("sandbox_cpus"),
       sandboxMemory: text("sandbox_memory"),
+      // Opt-in claude-mem worktree adoption (issue #274, default off). When on, a
+      // settling job triggers claude-mem's `adopt` for its worktree right before
+      // Drydock removes it, consolidating the per-worktree memory into the parent
+      // project while the worktree still exists. Best-effort and depends on the
+      // external claude-mem plugin being installed, so it is off by default.
+      adoptClaudeMem: integer("adopt_claude_mem", { mode: "boolean" }).notNull().default(false),
       createdAt: integer("created_at").notNull().default(sql`(unixepoch())`)
     });
     promptTemplates = sqliteTable("prompt_templates", {
@@ -13498,6 +13504,11 @@ var init_schema = __esm({
         // template (no saved repo version). Lets analytics slice outcomes by the
         // exact prompt revision a job ran with, alongside model and agent.
         implementPromptVersion: integer("implement_prompt_version"),
+        // Per-job turn budget; 0 means unlimited (issue #254). The effective default
+        // for new jobs comes from the global maxTurns setting (createJob always seeds
+        // an explicit value), so this column default is dead for real inserts — it
+        // stays at the frozen migration value (40) to avoid a no-op SQLite table
+        // rebuild just to realign a fallback that is never hit.
         maxTurns: integer("max_turns").notNull().default(40),
         totalInputTokens: integer("total_input_tokens").notNull().default(0),
         totalOutputTokens: integer("total_output_tokens").notNull().default(0),
@@ -13987,9 +13998,11 @@ var init_service = __esm({
       // Per-job turn budget (issue #254). 0 is off (unlimited): the runner drops the
       // CLI `--max-turns` flag and the OpenRouter loop skips its turn check, so a
       // long task is bounded only by maxJobMinutes / the per-job cost cap. Defaults
-      // high (200) so normal tasks finish — the live test job hit the old 40-turn
-      // wall on an ordinary issue. The value seeds each new job's budget.
-      maxTurns: import_zod3.z.number().int().nonnegative().default(200),
+      // to 0 (unlimited) so a fresh install is fully autonomous out of the box —
+      // ordinary issues routinely exceed any fixed turn wall and a max-turns abort
+      // would otherwise escalate to needs_human. The value seeds each new job's
+      // budget; set a positive ceiling here or per-call to cap turns.
+      maxTurns: import_zod3.z.number().int().nonnegative().default(0),
       // Hard wall-clock timeout per agent session in minutes (issue #47). A hung
       // agent (network stall, MCP deadlock, stdin prompt) is aborted after this so
       // it never holds a job slot forever. Defaults to 120 so long autonomous tasks
@@ -14015,6 +14028,15 @@ var init_service = __esm({
       // Auto-wait on Codex usage limits (issue #167, ADR 030): the same park-and-
       // resume treatment for OpenAI/ChatGPT-plan limits hit by the Codex CLI.
       codexLimitAutoWait: import_zod3.z.boolean().default(true),
+      // Auto-resume a job that exhausts its positive turn budget (issue #277). The
+      // CLI aborts with an `error_max_turns` result and no provider-limit signal;
+      // when on, Drydock resumes the stored session to continue the work (a bounded
+      // number of times) instead of parking it in needs_human as "exited non-zero".
+      // On by default per the autonomous model — a turn wall is recoverable, not an
+      // operator decision. Off restores the plain escalation (with the clear
+      // turn-budget reason either way). Only fires when a positive turn budget is
+      // set; the default unlimited budget (0) never hits the wall.
+      maxTurnsAutoResume: import_zod3.z.boolean().default(true),
       // Global kill-switch for opt-in release management (issue #59, ADR 028). Off by
       // default; both this and a repo's own `releaseEnabled` must be on for the
       // release pipeline to run for that repo. Cutting a public release is hard to
@@ -26397,6 +26419,7 @@ function toParsed(event) {
   } else {
     base.sessionId = event.session_id;
     base.resultText = event.result;
+    base.resultSubtype = event.subtype;
     base.costUsd = event.total_cost_usd;
     base.inputTokens = event.usage?.input_tokens ?? 0;
     base.outputTokens = event.usage?.output_tokens ?? 0;
@@ -26499,6 +26522,8 @@ var init_parser = __esm({
       costUsd = 0;
       /** Final result text from the stream's result event, when it carried one. */
       resultText;
+      /** Result event subtype from the stream, e.g. `error_max_turns` (issue #277). */
+      resultSubtype;
       /** Whether the stream's result event was flagged as an error (issue #166). */
       resultIsError = false;
       /** Latest subscription rate-limit snapshot seen in the stream (issue #188). */
@@ -26547,6 +26572,7 @@ var init_parser = __esm({
             this.totalCacheReadInputTokens = parsed.cacheReadInputTokens;
           if (parsed.costUsd !== void 0) this.costUsd = parsed.costUsd;
           if (parsed.resultText !== void 0) this.resultText = parsed.resultText;
+          if (parsed.resultSubtype !== void 0) this.resultSubtype = parsed.resultSubtype;
           this.resultIsError = parsed.isError;
         } else {
           this.totalInputTokens += parsed.inputTokens;
@@ -28993,6 +29019,10 @@ function requireRepo(repoId, db) {
 function listIssues(repoId, db = getDb()) {
   return db.select().from(issues).where(eq(issues.repoId, repoId)).orderBy(asc(issues.priority), asc(issues.number)).all();
 }
+function getIssueTitle(repoId, number2, db = getDb()) {
+  const row = db.select({ title: issues.title }).from(issues).where(and(eq(issues.repoId, repoId), eq(issues.number, number2))).get();
+  return row?.title ?? null;
+}
 function syncIssuesFromGh(repoId, fetched, db = getDb()) {
   const existing = db.select().from(issues).where(eq(issues.repoId, repoId)).all();
   const existingByNumber = new Map(existing.map((i) => [i.number, i]));
@@ -30137,6 +30167,13 @@ function worktreeHome() {
 function sanitize(name) {
   return name.replace(/[^a-zA-Z0-9._-]/g, "-");
 }
+function slugifyTitle(title) {
+  return title.normalize("NFKD").replace(new RegExp("\\p{Diacritic}", "gu"), "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, MAX_SLUG_LENGTH).replace(/-+$/g, "");
+}
+function issueBranchLabel(issueNumber, title) {
+  const slug = title ? slugifyTitle(title) : "";
+  return slug ? `issue-${issueNumber}-${slug}` : `issue-${issueNumber}`;
+}
 function repoWorktreesDir(repoName) {
   return (0, import_node_path.join)(worktreeHome(), "worktrees", sanitize(repoName));
 }
@@ -30147,7 +30184,7 @@ function stripAiAttribution(message) {
 function nonEmptyCommitMessage(cleaned) {
   return cleaned.trim() === "" ? STRIPPED_MESSAGE_FALLBACK : cleaned;
 }
-var import_node_fs, import_node_os2, import_node_path, AI_ASSISTANT_NAMES, AI_ATTRIBUTION_LINE, STRIPPED_MESSAGE_FALLBACK, WorktreeError, EmptyCommitError, repoLocks, WorktreeManager;
+var import_node_fs, import_node_os2, import_node_path, MAX_SLUG_LENGTH, AI_ASSISTANT_NAMES, AI_ATTRIBUTION_LINE, STRIPPED_MESSAGE_FALLBACK, WorktreeError, EmptyCommitError, repoLocks, WorktreeManager;
 var init_worktree = __esm({
   "src/lib/git/worktree.ts"() {
     "use strict";
@@ -30155,6 +30192,7 @@ var init_worktree = __esm({
     import_node_os2 = require("node:os");
     import_node_path = require("node:path");
     init_runner();
+    MAX_SLUG_LENGTH = 50;
     AI_ASSISTANT_NAMES = "claude|anthropic|codex|openai|chatgpt|copilot|gemini|cursor|devin";
     AI_ATTRIBUTION_LINE = new RegExp(
       `^(?:co-authored-by:.*\\b(?:${AI_ASSISTANT_NAMES})\\b|\u{1F916}?\\s*generated (?:with|by)\\b.*\\b(?:${AI_ASSISTANT_NAMES})\\b)`,
@@ -30403,6 +30441,10 @@ var init_defaults = __esm({
       ciFix: "ci-fix",
       plan: "plan",
       limitResume: "limit-resume",
+      // Continuation prompt for a session resumed after exhausting its turn budget
+      // (issue #277): unlike the limit-resume path, the worktree is kept intact, so
+      // the prior session's uncommitted work is still present.
+      turnResume: "turn-resume",
       // Continuation prompt for a needs_human job an operator unblocked with typed
       // guidance (issue #257); the human's instruction is injected via $INSTRUCTION.
       humanResume: "human-resume",
@@ -30536,6 +30578,31 @@ var init_defaults = __esm({
         "",
         "Drydock appends `Closes #$ISSUE_NUM` and removes the file \u2014 do not commit it."
       ].join("\n"),
+      // Continuation prompt for a session resumed after hitting its turn budget
+      // (issue #277): the conversation context survives via --resume AND the worktree
+      // is kept, so any uncommitted edits are still in place. The agent simply
+      // continues where it left off rather than re-applying lost work.
+      "turn-resume": [
+        `Your previous session on issue #$ISSUE_NUM in "$REPO_NAME" was paused because it reached its`,
+        `turn budget. You are resuming on branch "$BRANCH" with your conversation context and any`,
+        "uncommitted edits from the interrupted session still in place \u2014 just continue from where you",
+        "left off and finish implementing the issue. Follow the repo's conventions (`CLAUDE.md`/",
+        "`AGENTS.md`, neighbouring code) and keep working test-first: a failing test that captures the",
+        "requirement, then the code to make it green. Before you finish, verify: run the repo's tests,",
+        "typecheck, lint, and build, and do not finish on a red signal. Never weaken or delete a test",
+        "to make the suite pass. Keep the change focused. Split your work into focused, thematic",
+        "commits, each with a clear Conventional Commit subject (`type(scope): summary`) grouped by",
+        "concern \u2014 not one mega-commit. Never add AI attribution to a commit: no `Co-Authored-By`",
+        "trailer naming an assistant, no `Generated with Claude Code` line, and no mention of the tool",
+        "or model in the message. Do not push or open a pull request yourself; Drydock pushes and opens",
+        "the PR, committing anything you leave uncommitted.",
+        "Before finishing, write `.drydock/PR.md`: first line a Conventional Commit subject (used as",
+        "the commit message and PR title), then a blank line, then a body in this format:",
+        "",
+        "$PR_FORMAT",
+        "",
+        "Drydock appends `Closes #$ISSUE_NUM` and removes the file \u2014 do not commit it."
+      ].join("\n"),
       // Continuation prompt for a session resumed with human guidance (issue #257):
       // a needs_human job an operator unblocked by typing how to proceed. The
       // conversation context survives via --resume and the prior commits are
@@ -30999,7 +31066,10 @@ async function runOpenRouterJobSession(job, prompt, cwd, deps = {}) {
     inputTokens: 0,
     outputTokens: 0,
     timedOut: false,
-    costExceeded: false
+    costExceeded: false,
+    // The HTTP tool-loop enforces its own turn budget and never emits the CLI's
+    // `error_max_turns` result, so it never sets this max-turns signal (issue #277).
+    maxTurnsReached: false
   };
   const latch = agentLimitBlocked("openrouter", db);
   if (latch) {
@@ -31192,7 +31262,16 @@ async function runOpenRouterJobSession(job, prompt, cwd, deps = {}) {
   } else {
     db.update(jobs).set({ totalInputTokens: inputTokens, totalOutputTokens: outputTokens, costUsd }).where(eq(jobs.id, job.id)).run();
   }
-  return { exitCode, costUsd, inputTokens, outputTokens, timedOut, costExceeded, limit };
+  return {
+    exitCode,
+    costUsd,
+    inputTokens,
+    outputTokens,
+    timedOut,
+    costExceeded,
+    maxTurnsReached: false,
+    limit
+  };
 }
 var TIMED_OUT_EXIT, COST_EXCEEDED_EXIT, LIMIT_BLOCKED_EXIT, SYSTEM_PROMPT;
 var init_session3 = __esm({
@@ -31227,6 +31306,10 @@ var init_session3 = __esm({
 });
 
 // src/lib/orchestrator/agent-session.ts
+function reachedMaxTurns(parser, outcome) {
+  if (outcome.timedOut || outcome.costExceeded) return false;
+  return parser.resultSubtype === MAX_TURNS_RESULT_SUBTYPE;
+}
 function limitGateResult(provider, job, broker, db) {
   const latch = agentLimitBlocked(provider.id, db);
   if (!latch) return void 0;
@@ -31243,6 +31326,7 @@ function limitGateResult(provider, job, broker, db) {
     outputTokens: 0,
     timedOut: false,
     costExceeded: false,
+    maxTurnsReached: false,
     limit: {
       agent: provider.id,
       kind: latch.kind,
@@ -31466,6 +31550,7 @@ async function spawnAgentSession(job, prompt, cwd, deps = {}) {
     outputTokens: parser.totalOutputTokens,
     timedOut,
     costExceeded,
+    maxTurnsReached: reachedMaxTurns(parser, { timedOut, costExceeded }),
     spawnError,
     limit: classifySessionFailure(provider, parser, stderrTail, {
       exitCode,
@@ -31595,6 +31680,7 @@ async function resumeAgentSession(job, sessionId, failedLog, cwd, deps = {}) {
     outputTokens: parser.totalOutputTokens,
     timedOut,
     costExceeded,
+    maxTurnsReached: reachedMaxTurns(parser, { timedOut, costExceeded }),
     spawnError,
     limit: classifySessionFailure(provider, parser, stderrTail, {
       exitCode,
@@ -31603,7 +31689,7 @@ async function resumeAgentSession(job, sessionId, failedLog, cwd, deps = {}) {
     })
   };
 }
-var TIMED_OUT_EXIT2, COST_EXCEEDED_EXIT2, LIMIT_BLOCKED_EXIT2, STDERR_TAIL_MAX, ZERO_USAGE;
+var MAX_TURNS_RESULT_SUBTYPE, TIMED_OUT_EXIT2, COST_EXCEEDED_EXIT2, LIMIT_BLOCKED_EXIT2, STDERR_TAIL_MAX, ZERO_USAGE;
 var init_agent_session = __esm({
   "src/lib/orchestrator/agent-session.ts"() {
     "use strict";
@@ -31620,6 +31706,7 @@ var init_agent_session = __esm({
     init_provider_limit();
     init_provider_usage();
     init_singleton();
+    MAX_TURNS_RESULT_SUBTYPE = "error_max_turns";
     TIMED_OUT_EXIT2 = -1;
     COST_EXCEEDED_EXIT2 = -2;
     LIMIT_BLOCKED_EXIT2 = -3;
@@ -34212,6 +34299,89 @@ var init_ci_babysitter = __esm({
   }
 });
 
+// src/lib/orchestrator/claude-mem-adopt.ts
+function defaultConfigDir() {
+  return process.env.CLAUDE_CONFIG_DIR ?? (0, import_node_path8.join)((0, import_node_os5.homedir)(), ".claude");
+}
+function compareVersionDesc(a, b) {
+  const pa = a.split(".").map((n) => Number.parseInt(n, 10) || 0);
+  const pb = b.split(".").map((n) => Number.parseInt(n, 10) || 0);
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+    const diff = (pb[i] ?? 0) - (pa[i] ?? 0);
+    if (diff !== 0) return diff;
+  }
+  return b.localeCompare(a);
+}
+function normalizeRoot(root) {
+  return (0, import_node_fs4.existsSync)((0, import_node_path8.join)(root, "plugin", "scripts")) ? (0, import_node_path8.join)(root, "plugin") : root;
+}
+function hasWorkerScripts(pluginDir) {
+  return (0, import_node_fs4.existsSync)((0, import_node_path8.join)(pluginDir, "scripts", "bun-runner.js")) && (0, import_node_fs4.existsSync)((0, import_node_path8.join)(pluginDir, "scripts", "worker-service.cjs"));
+}
+function resolveClaudeMemPlugin(configDir = defaultConfigDir()) {
+  const candidates = [];
+  const envRoot = process.env.CLAUDE_PLUGIN_ROOT ?? process.env.PLUGIN_ROOT;
+  if (envRoot) candidates.push(envRoot);
+  const cacheDir = (0, import_node_path8.join)(configDir, "plugins", "cache", "thedotmack", "claude-mem");
+  if ((0, import_node_fs4.existsSync)(cacheDir)) {
+    let versions = [];
+    try {
+      versions = (0, import_node_fs4.readdirSync)(cacheDir, { withFileTypes: true }).filter((e) => e.isDirectory() && /^\d/.test(e.name)).map((e) => e.name).sort(compareVersionDesc);
+    } catch {
+      versions = [];
+    }
+    for (const version2 of versions) candidates.push((0, import_node_path8.join)(cacheDir, version2));
+  }
+  candidates.push((0, import_node_path8.join)(configDir, "plugins", "marketplaces", "thedotmack", "plugin"));
+  for (const root of candidates) {
+    const pluginDir = normalizeRoot(root);
+    if (hasWorkerScripts(pluginDir)) return pluginDir;
+  }
+  return null;
+}
+async function adoptWorktreeMemory(input, opts = {}) {
+  const resolvePlugin = opts.resolvePlugin ?? resolveClaudeMemPlugin;
+  const run = opts.run ?? spawnRunner;
+  try {
+    const pluginDir = resolvePlugin(opts.configDir);
+    if (!pluginDir) {
+      logError(`[claude-mem] adoption skipped for ${input.branch}: plugin not installed`);
+      return;
+    }
+    const args = [
+      (0, import_node_path8.join)(pluginDir, "scripts", "bun-runner.js"),
+      (0, import_node_path8.join)(pluginDir, "scripts", "worker-service.cjs"),
+      "adopt",
+      "--branch",
+      input.branch,
+      "--cwd",
+      input.cwd
+    ];
+    const result = await run("node", args, input.cwd, {
+      timeoutMs: opts.timeoutMs ?? ADOPT_TIMEOUT_MS
+    });
+    if (result.exitCode !== 0) {
+      logError(
+        `[claude-mem] adoption for ${input.branch} exited ${result.exitCode}: ${result.stderr.trim()}`
+      );
+    }
+  } catch (err) {
+    logError(`[claude-mem] adoption failed for ${input.branch}`, err);
+  }
+}
+var import_node_fs4, import_node_os5, import_node_path8, ADOPT_TIMEOUT_MS;
+var init_claude_mem_adopt = __esm({
+  "src/lib/orchestrator/claude-mem-adopt.ts"() {
+    "use strict";
+    import_node_fs4 = require("node:fs");
+    import_node_os5 = require("node:os");
+    import_node_path8 = require("node:path");
+    init_runner();
+    init_logger2();
+    ADOPT_TIMEOUT_MS = 6e4;
+  }
+});
+
 // src/lib/orchestrator/followups-metadata.ts
 function parseFollowups(raw) {
   const entries = [];
@@ -34245,7 +34415,7 @@ function parseFollowups(raw) {
 function readFollowups(worktreePath) {
   let raw;
   try {
-    raw = (0, import_node_fs4.readFileSync)((0, import_node_path8.join)(worktreePath, FOLLOWUPS_METADATA_PATH), "utf8");
+    raw = (0, import_node_fs5.readFileSync)((0, import_node_path9.join)(worktreePath, FOLLOWUPS_METADATA_PATH), "utf8");
   } catch {
     return [];
   }
@@ -34253,16 +34423,16 @@ function readFollowups(worktreePath) {
 }
 function consumeFollowups(worktreePath) {
   const entries = readFollowups(worktreePath);
-  (0, import_node_fs4.rmSync)((0, import_node_path8.join)(worktreePath, FOLLOWUPS_METADATA_PATH), { force: true });
+  (0, import_node_fs5.rmSync)((0, import_node_path9.join)(worktreePath, FOLLOWUPS_METADATA_PATH), { force: true });
   return entries;
 }
-var import_node_fs4, import_node_path8, FOLLOWUPS_METADATA_PATH, TITLE_MAX_CHARS, BODY_MAX_CHARS, MAX_ENTRIES, HEADING;
+var import_node_fs5, import_node_path9, FOLLOWUPS_METADATA_PATH, TITLE_MAX_CHARS, BODY_MAX_CHARS, MAX_ENTRIES, HEADING;
 var init_followups_metadata = __esm({
   "src/lib/orchestrator/followups-metadata.ts"() {
     "use strict";
-    import_node_fs4 = require("node:fs");
-    import_node_path8 = require("node:path");
-    FOLLOWUPS_METADATA_PATH = (0, import_node_path8.join)(".drydock", "FOLLOWUPS.md");
+    import_node_fs5 = require("node:fs");
+    import_node_path9 = require("node:path");
+    FOLLOWUPS_METADATA_PATH = (0, import_node_path9.join)(".drydock", "FOLLOWUPS.md");
     TITLE_MAX_CHARS = 300;
     BODY_MAX_CHARS = 6e4;
     MAX_ENTRIES = 20;
@@ -34657,7 +34827,7 @@ async function runPrAuditPass(deps) {
     };
     let generate = deps.generate;
     if (!generate) {
-      tmp = await (0, import_promises3.mkdtemp)((0, import_node_path9.join)((0, import_node_os5.tmpdir)(), "drydock-pr-audit-"));
+      tmp = await (0, import_promises3.mkdtemp)((0, import_node_path10.join)((0, import_node_os6.tmpdir)(), "drydock-pr-audit-"));
       const provider = getAgentProvider(config.agent);
       generate = buildPrAuditGenerator({
         provider,
@@ -34748,13 +34918,13 @@ function startPrAudit(jobId, db = getDb(), opts = {}) {
   });
   return { job, prNumber: job.prNumber, done };
 }
-var import_promises3, import_node_os5, import_node_path9, PR_AUDIT_TIMEOUT_MS;
+var import_promises3, import_node_os6, import_node_path10, PR_AUDIT_TIMEOUT_MS;
 var init_pr_audit_driver = __esm({
   "src/lib/orchestrator/pr-audit-driver.ts"() {
     "use strict";
     import_promises3 = require("node:fs/promises");
-    import_node_os5 = require("node:os");
-    import_node_path9 = require("node:path");
+    import_node_os6 = require("node:os");
+    import_node_path10 = require("node:path");
     init_registry();
     init_types2();
     init_client2();
@@ -34790,7 +34960,7 @@ function parsePrMetadata(raw) {
 function readPrMetadata(worktreePath) {
   let raw;
   try {
-    raw = (0, import_node_fs5.readFileSync)((0, import_node_path10.join)(worktreePath, PR_METADATA_PATH), "utf8");
+    raw = (0, import_node_fs6.readFileSync)((0, import_node_path11.join)(worktreePath, PR_METADATA_PATH), "utf8");
   } catch {
     return null;
   }
@@ -34798,16 +34968,16 @@ function readPrMetadata(worktreePath) {
 }
 function consumePrMetadata(worktreePath) {
   const meta = readPrMetadata(worktreePath);
-  (0, import_node_fs5.rmSync)((0, import_node_path10.join)(worktreePath, PR_METADATA_PATH), { force: true });
+  (0, import_node_fs6.rmSync)((0, import_node_path11.join)(worktreePath, PR_METADATA_PATH), { force: true });
   return meta;
 }
-var import_node_fs5, import_node_path10, PR_METADATA_PATH, TITLE_MAX_CHARS2, BODY_MAX_CHARS2;
+var import_node_fs6, import_node_path11, PR_METADATA_PATH, TITLE_MAX_CHARS2, BODY_MAX_CHARS2;
 var init_pr_metadata = __esm({
   "src/lib/orchestrator/pr-metadata.ts"() {
     "use strict";
-    import_node_fs5 = require("node:fs");
-    import_node_path10 = require("node:path");
-    PR_METADATA_PATH = (0, import_node_path10.join)(".drydock", "PR.md");
+    import_node_fs6 = require("node:fs");
+    import_node_path11 = require("node:path");
+    PR_METADATA_PATH = (0, import_node_path11.join)(".drydock", "PR.md");
     TITLE_MAX_CHARS2 = 300;
     BODY_MAX_CHARS2 = 6e4;
   }
@@ -34855,7 +35025,7 @@ function parseQuestions(raw) {
 function readQuestions(worktreePath) {
   let raw;
   try {
-    raw = (0, import_node_fs6.readFileSync)((0, import_node_path11.join)(worktreePath, QUESTIONS_METADATA_PATH), "utf8");
+    raw = (0, import_node_fs7.readFileSync)((0, import_node_path12.join)(worktreePath, QUESTIONS_METADATA_PATH), "utf8");
   } catch {
     return null;
   }
@@ -34863,16 +35033,16 @@ function readQuestions(worktreePath) {
 }
 function consumeQuestions(worktreePath) {
   const questions = readQuestions(worktreePath);
-  (0, import_node_fs6.rmSync)((0, import_node_path11.join)(worktreePath, QUESTIONS_METADATA_PATH), { force: true });
+  (0, import_node_fs7.rmSync)((0, import_node_path12.join)(worktreePath, QUESTIONS_METADATA_PATH), { force: true });
   return questions;
 }
-var import_node_fs6, import_node_path11, QUESTIONS_METADATA_PATH, QUESTIONS_MAX_CHARS;
+var import_node_fs7, import_node_path12, QUESTIONS_METADATA_PATH, QUESTIONS_MAX_CHARS;
 var init_questions_metadata = __esm({
   "src/lib/orchestrator/questions-metadata.ts"() {
     "use strict";
-    import_node_fs6 = require("node:fs");
-    import_node_path11 = require("node:path");
-    QUESTIONS_METADATA_PATH = (0, import_node_path11.join)(".drydock", "QUESTIONS.md");
+    import_node_fs7 = require("node:fs");
+    import_node_path12 = require("node:path");
+    QUESTIONS_METADATA_PATH = (0, import_node_path12.join)(".drydock", "QUESTIONS.md");
     QUESTIONS_MAX_CHARS = 6e4;
   }
 });
@@ -34905,7 +35075,7 @@ function parseReleaseMetadata(raw) {
 function readReleaseMetadata(worktreePath) {
   let raw;
   try {
-    raw = (0, import_node_fs7.readFileSync)((0, import_node_path12.join)(worktreePath, RELEASE_METADATA_PATH), "utf8");
+    raw = (0, import_node_fs8.readFileSync)((0, import_node_path13.join)(worktreePath, RELEASE_METADATA_PATH), "utf8");
   } catch {
     return null;
   }
@@ -34913,16 +35083,16 @@ function readReleaseMetadata(worktreePath) {
 }
 function consumeReleaseMetadata(worktreePath) {
   const meta = readReleaseMetadata(worktreePath);
-  (0, import_node_fs7.rmSync)((0, import_node_path12.join)(worktreePath, RELEASE_METADATA_PATH), { force: true });
+  (0, import_node_fs8.rmSync)((0, import_node_path13.join)(worktreePath, RELEASE_METADATA_PATH), { force: true });
   return meta;
 }
-var import_node_fs7, import_node_path12, RELEASE_METADATA_PATH, TITLE_MAX_CHARS3, NOTES_MAX_CHARS, TAG_LINE, VERSION_TITLE;
+var import_node_fs8, import_node_path13, RELEASE_METADATA_PATH, TITLE_MAX_CHARS3, NOTES_MAX_CHARS, TAG_LINE, VERSION_TITLE;
 var init_release_metadata = __esm({
   "src/lib/orchestrator/release-metadata.ts"() {
     "use strict";
-    import_node_fs7 = require("node:fs");
-    import_node_path12 = require("node:path");
-    RELEASE_METADATA_PATH = (0, import_node_path12.join)(".drydock", "RELEASE.md");
+    import_node_fs8 = require("node:fs");
+    import_node_path13 = require("node:path");
+    RELEASE_METADATA_PATH = (0, import_node_path13.join)(".drydock", "RELEASE.md");
     TITLE_MAX_CHARS3 = 300;
     NOTES_MAX_CHARS = 6e4;
     TAG_LINE = /^tag:\s*(\S+)\s*$/i;
@@ -35287,7 +35457,7 @@ async function runVerificationPass(deps) {
     };
     let generate = deps.generate;
     if (!generate) {
-      tmp = await (0, import_promises4.mkdtemp)((0, import_node_path13.join)((0, import_node_os6.tmpdir)(), "drydock-verify-"));
+      tmp = await (0, import_promises4.mkdtemp)((0, import_node_path14.join)((0, import_node_os7.tmpdir)(), "drydock-verify-"));
       generate = buildVerificationGenerator({
         provider,
         command,
@@ -35330,13 +35500,13 @@ async function runVerificationPass(deps) {
     }
   }
 }
-var import_promises4, import_node_os6, import_node_path13, VERIFY_TIMEOUT_MS, COMMENT_HEADER;
+var import_promises4, import_node_os7, import_node_path14, VERIFY_TIMEOUT_MS, COMMENT_HEADER;
 var init_verify_driver = __esm({
   "src/lib/orchestrator/verify-driver.ts"() {
     "use strict";
     import_promises4 = require("node:fs/promises");
-    import_node_os6 = require("node:os");
-    import_node_path13 = require("node:path");
+    import_node_os7 = require("node:os");
+    import_node_path14 = require("node:path");
     init_client2();
     init_subtasks();
     init_verify();
@@ -35521,6 +35691,7 @@ async function runJobCore(jobId, deps, send) {
   const consumeQuestions2 = deps.consumeQuestions ?? consumeQuestions;
   const consumeFollowups2 = deps.consumeFollowups ?? consumeFollowups;
   const markNeedsHuman = deps.markNeedsHuman ?? ((issueNumber) => markIssueNeedsHuman(repo.id, issueNumber, db));
+  const adoptClaudeMem = deps.adoptClaudeMem ?? adoptWorktreeMemory;
   const resumeStoredSession = (j, prompt, cwd) => {
     if (!j.sessionId) throw new Error(`job ${j.id} has no session id to resume`);
     return resumeAgentSession(j, j.sessionId, "", cwd, {
@@ -35649,7 +35820,11 @@ async function runJobCore(jobId, deps, send) {
     const humanInstruction = job.humanInstruction;
     const instructionResume = !!humanInstruction && !!job.sessionId && provider.supportsResume;
     const resumeOnExistingBranch = !!humanInstruction && !!job.branch;
-    wt = resumeOnExistingBranch ? await worktrees.prepareResume(repo, job.id, job.branch) : await worktrees.prepare(repo, job.id, job.issueNumber);
+    const branchLabel = issueBranchLabel(
+      job.issueNumber,
+      getIssueTitle(repo.id, job.issueNumber, db)
+    );
+    wt = resumeOnExistingBranch ? await worktrees.prepareResume(repo, job.id, job.branch) : await worktrees.prepare(repo, job.id, job.issueNumber, branchLabel);
     recordEvent(job.id, "worktree", { path: wt.path, branch: wt.branch }, db);
     if (sandboxRequested) {
       const prepared = await prepareSandbox({
@@ -35803,6 +35978,36 @@ ${planText}`
       if (repo.autoDecompose) markSubtasksParked(repo.id, job.issueNumber, db);
       return afterSession;
     }
+    let turnResumeAttempts = 0;
+    while (session.maxTurnsReached && getSettings(db).maxTurnsAutoResume && session.sessionId && provider.supportsResume && turnResumeAttempts < MAX_TURN_RESUMES) {
+      turnResumeAttempts += 1;
+      recordEvent(
+        job.id,
+        "status",
+        {
+          reason: `turn budget (${job.maxTurns}) reached, resuming`,
+          attempt: turnResumeAttempts,
+          sessionId: session.sessionId
+        },
+        db
+      );
+      if (repo.autoDecompose) markSubtasksWorking(repo.id, job.issueNumber, db);
+      const resumePrompt = renderTemplate(
+        resolveTemplateContent(repo.id, TEMPLATE_NAMES.turnResume, db),
+        {
+          ISSUE_NUM: job.issueNumber,
+          BRANCH: wt.branch,
+          REPO_NAME: repo.name,
+          PR_FORMAT: resolveTemplateContent(repo.id, TEMPLATE_NAMES.prFormat, db)
+        }
+      );
+      session = await resumeLimitSession(getJob(job.id, db), resumePrompt, wt.path);
+      const afterResume = getJob(job.id, db);
+      if (afterResume.status === "aborted" || afterResume.status === "interrupted") {
+        if (repo.autoDecompose) markSubtasksParked(repo.id, job.issueNumber, db);
+        return afterResume;
+      }
+    }
     if (session.timedOut) {
       return await parkForHuman(`${provider.label} timed out after ${maxJobMinutes} minutes`);
     }
@@ -35825,6 +36030,9 @@ ${planText}`
       }
       return await parkOnLimit(limit);
     }
+    if (session.maxTurnsReached) {
+      return await parkForHuman(`turn budget (${job.maxTurns}) reached`);
+    }
     if (session.exitCode !== 0) {
       return await parkForHuman(`${provider.label} exited non-zero`);
     }
@@ -35942,6 +36150,13 @@ ${questions}`
     return current;
   } finally {
     if (wt && !preserveWorktree) {
+      if (repo.adoptClaudeMem) {
+        try {
+          await adoptClaudeMem({ branch: wt.branch, cwd: wt.path });
+        } catch (adoptErr) {
+          logError(`[run-job] claude-mem adoption failed for job ${job.id}`, adoptErr);
+        }
+      }
       try {
         await worktrees.remove(wt, repo.path);
       } catch (cleanupErr) {
@@ -35950,7 +36165,7 @@ ${questions}`
     }
   }
 }
-var PLAN_MAX_CHARS, ISSUE_TITLE_MAX_CHARS, ISSUE_BODY_MAX_CHARS, HUMAN_INSTRUCTION_MAX_CHARS;
+var MAX_TURN_RESUMES, PLAN_MAX_CHARS, ISSUE_TITLE_MAX_CHARS, ISSUE_BODY_MAX_CHARS, HUMAN_INSTRUCTION_MAX_CHARS;
 var init_run_job = __esm({
   "src/lib/orchestrator/run-job.ts"() {
     "use strict";
@@ -35975,6 +36190,7 @@ var init_run_job = __esm({
     init_agent_command();
     init_agent_session();
     init_ci_babysitter();
+    init_claude_mem_adopt();
     init_followups_metadata();
     init_jobs();
     init_needs_human();
@@ -35988,6 +36204,7 @@ var init_run_job = __esm({
     init_state_machine();
     init_subtask_driver();
     init_verify_driver();
+    MAX_TURN_RESUMES = 3;
     PLAN_MAX_CHARS = 1e4;
     ISSUE_TITLE_MAX_CHARS = 500;
     ISSUE_BODY_MAX_CHARS = 2e4;
@@ -36022,7 +36239,7 @@ function waitForIdle(timeoutMs = 3e4, pollMs = 100) {
   });
 }
 function lockPath() {
-  return (0, import_node_path14.join)(worktreeHome(), "instance.lock");
+  return (0, import_node_path15.join)(worktreeHome(), "instance.lock");
 }
 function pidAlive(pid) {
   try {
@@ -36042,17 +36259,17 @@ function parseLock(text2) {
 }
 function readLock(path2) {
   try {
-    return parseLock((0, import_node_fs8.readFileSync)(path2, "utf8"));
+    return parseLock((0, import_node_fs9.readFileSync)(path2, "utf8"));
   } catch {
     return { pid: null, ts: null };
   }
 }
 function writeLock(path2) {
-  const fd = (0, import_node_fs8.openSync)(path2, "wx");
+  const fd = (0, import_node_fs9.openSync)(path2, "wx");
   try {
-    (0, import_node_fs8.writeSync)(fd, JSON.stringify({ pid: process.pid, ts: Date.now() }));
+    (0, import_node_fs9.writeSync)(fd, JSON.stringify({ pid: process.pid, ts: Date.now() }));
   } finally {
-    (0, import_node_fs8.closeSync)(fd);
+    (0, import_node_fs9.closeSync)(fd);
   }
 }
 function lockIsStale(record2, now) {
@@ -36064,7 +36281,7 @@ function lockIsStale(record2, now) {
 }
 function acquireInstanceLock() {
   const path2 = lockPath();
-  (0, import_node_fs8.mkdirSync)((0, import_node_path14.dirname)(path2), { recursive: true });
+  (0, import_node_fs9.mkdirSync)((0, import_node_path15.dirname)(path2), { recursive: true });
   try {
     writeLock(path2);
     return true;
@@ -36072,7 +36289,7 @@ function acquireInstanceLock() {
   }
   if (!lockIsStale(readLock(path2), Date.now())) return false;
   try {
-    (0, import_node_fs8.unlinkSync)(path2);
+    (0, import_node_fs9.unlinkSync)(path2);
     writeLock(path2);
     return true;
   } catch {
@@ -36084,16 +36301,16 @@ function refreshInstanceLock() {
   if (readLock(path2).pid !== process.pid) return false;
   const tmp = `${path2}.${process.pid}.tmp`;
   try {
-    (0, import_node_fs8.writeFileSync)(tmp, JSON.stringify({ pid: process.pid, ts: Date.now() }));
+    (0, import_node_fs9.writeFileSync)(tmp, JSON.stringify({ pid: process.pid, ts: Date.now() }));
     if (readLock(path2).pid !== process.pid) {
-      (0, import_node_fs8.unlinkSync)(tmp);
+      (0, import_node_fs9.unlinkSync)(tmp);
       return false;
     }
-    (0, import_node_fs8.renameSync)(tmp, path2);
+    (0, import_node_fs9.renameSync)(tmp, path2);
     return true;
   } catch {
     try {
-      (0, import_node_fs8.unlinkSync)(tmp);
+      (0, import_node_fs9.unlinkSync)(tmp);
     } catch {
     }
     return false;
@@ -36117,16 +36334,16 @@ function releaseInstanceLock() {
   const path2 = lockPath();
   if (readLock(path2).pid !== process.pid) return;
   try {
-    (0, import_node_fs8.unlinkSync)(path2);
+    (0, import_node_fs9.unlinkSync)(path2);
   } catch {
   }
 }
-var import_node_fs8, import_node_path14, draining, activeJobs, LOCK_HEARTBEAT_MS, LOCK_TTL_MS, heartbeatTimer;
+var import_node_fs9, import_node_path15, draining, activeJobs, LOCK_HEARTBEAT_MS, LOCK_TTL_MS, heartbeatTimer;
 var init_runtime2 = __esm({
   "src/lib/orchestrator/runtime.ts"() {
     "use strict";
-    import_node_fs8 = require("node:fs");
-    import_node_path14 = require("node:path");
+    import_node_fs9 = require("node:fs");
+    import_node_path15 = require("node:path");
     init_worktree();
     draining = false;
     activeJobs = /* @__PURE__ */ new Set();
@@ -36514,7 +36731,7 @@ async function reapOrphanedWorktrees(deps = {}) {
     const dir = repoWorktreesDir(repo.name);
     let entries;
     try {
-      entries = (0, import_node_fs9.readdirSync)(dir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
+      entries = (0, import_node_fs10.readdirSync)(dir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
     } catch {
       continue;
     }
@@ -36524,12 +36741,12 @@ async function reapOrphanedWorktrees(deps = {}) {
       const jobId = Number(match[1]);
       if (live.has(jobId)) continue;
       if (isLiveJob(jobId, db)) continue;
-      const path2 = (0, import_node_path15.join)(dir, entry);
+      const path2 = (0, import_node_path16.join)(dir, entry);
       await run("git", ["-C", repo.path, "worktree", "remove", "--force", path2]).catch(
         () => void 0
       );
       try {
-        (0, import_node_fs9.rmSync)(path2, { recursive: true, force: true });
+        (0, import_node_fs10.rmSync)(path2, { recursive: true, force: true });
         reaped++;
       } catch (err) {
         logError(`[worktree-reaper] failed to remove ${path2}`, err);
@@ -36538,12 +36755,12 @@ async function reapOrphanedWorktrees(deps = {}) {
   }
   return reaped;
 }
-var import_node_fs9, import_node_path15, JOB_DIR, FB_DIR, DH_DIR;
+var import_node_fs10, import_node_path16, JOB_DIR, FB_DIR, DH_DIR;
 var init_worktree_reaper = __esm({
   "src/lib/orchestrator/worktree-reaper.ts"() {
     "use strict";
-    import_node_fs9 = require("node:fs");
-    import_node_path15 = require("node:path");
+    import_node_fs10 = require("node:fs");
+    import_node_path16 = require("node:path");
     init_drizzle_orm();
     init_client2();
     init_queries();
@@ -36666,7 +36883,7 @@ function startOrchestrator() {
   process.once("SIGINT", onSignal);
   process.once("SIGTERM", onSignal);
 }
-var started, abortHandles, DEFAULT_ABORT_GRACE_MS, IDLE_WAIT_MS, PRUNE_INTERVAL_MS;
+var started, ABORT_HANDLES_KEY, globalWithAbort, abortHandles, DEFAULT_ABORT_GRACE_MS, IDLE_WAIT_MS, PRUNE_INTERVAL_MS;
 var init_singleton = __esm({
   "src/lib/orchestrator/singleton.ts"() {
     "use strict";
@@ -36682,7 +36899,10 @@ var init_singleton = __esm({
     init_runtime2();
     init_worktree_reaper();
     started = false;
-    abortHandles = /* @__PURE__ */ new Map();
+    ABORT_HANDLES_KEY = Symbol.for("drydock.orchestrator.abort-handles");
+    globalWithAbort = globalThis;
+    globalWithAbort[ABORT_HANDLES_KEY] ??= /* @__PURE__ */ new Map();
+    abortHandles = globalWithAbort[ABORT_HANDLES_KEY];
     DEFAULT_ABORT_GRACE_MS = 5e3;
     IDLE_WAIT_MS = DEFAULT_ABORT_GRACE_MS + 3e3;
     PRUNE_INTERVAL_MS = 24 * 60 * 60 * 1e3;
@@ -36691,13 +36911,13 @@ var init_singleton = __esm({
 
 // src/lib/db/client.ts
 function resolveMigrationsDir() {
-  return process.env.DRYDOCK_MIGRATIONS ?? (0, import_node_path16.resolve)(process.cwd(), "drizzle");
+  return process.env.DRYDOCK_MIGRATIONS ?? (0, import_node_path17.resolve)(process.cwd(), "drizzle");
 }
 function applyMigrations(sqlite) {
   const migrationsFolder = resolveMigrationsDir();
   let files;
   try {
-    files = (0, import_node_fs10.readdirSync)(migrationsFolder).filter((f) => f.endsWith(".sql")).sort();
+    files = (0, import_node_fs11.readdirSync)(migrationsFolder).filter((f) => f.endsWith(".sql")).sort();
   } catch {
     return;
   }
@@ -36708,7 +36928,7 @@ function applyMigrations(sqlite) {
   const record2 = sqlite.prepare("INSERT INTO __migrations (name) VALUES (?)");
   for (const file of files) {
     if (applied.has(file)) continue;
-    const sql2 = (0, import_node_fs10.readFileSync)((0, import_node_path16.join)(migrationsFolder, file), "utf8");
+    const sql2 = (0, import_node_fs11.readFileSync)((0, import_node_path17.join)(migrationsFolder, file), "utf8");
     sqlite.pragma("foreign_keys = OFF");
     try {
       const run = sqlite.transaction(() => {
@@ -36733,7 +36953,7 @@ function applyMigrations(sqlite) {
 }
 function createDb(dbPath) {
   if (dbPath !== ":memory:") {
-    (0, import_node_fs10.mkdirSync)((0, import_node_path16.dirname)(dbPath), { recursive: true });
+    (0, import_node_fs11.mkdirSync)((0, import_node_path17.dirname)(dbPath), { recursive: true });
   }
   const sqlite = new import_better_sqlite32.default(dbPath);
   try {
@@ -36749,7 +36969,7 @@ function createDb(dbPath) {
 function getDb() {
   if (singletonError) throw singletonError;
   if (!singleton2) {
-    const path2 = process.env.DRYDOCK_DB ?? (0, import_node_path16.resolve)(process.cwd(), "data/drydock.db");
+    const path2 = process.env.DRYDOCK_DB ?? (0, import_node_path17.resolve)(process.cwd(), "data/drydock.db");
     try {
       singleton2 = createDb(path2);
     } catch (err) {
@@ -36760,12 +36980,12 @@ function getDb() {
   }
   return singleton2;
 }
-var import_node_fs10, import_node_path16, import_better_sqlite32, FOREIGN_KEYS_PRAGMA, singleton2, singletonError;
+var import_node_fs11, import_node_path17, import_better_sqlite32, FOREIGN_KEYS_PRAGMA, singleton2, singletonError;
 var init_client2 = __esm({
   "src/lib/db/client.ts"() {
     "use strict";
-    import_node_fs10 = require("node:fs");
-    import_node_path16 = require("node:path");
+    import_node_fs11 = require("node:fs");
+    import_node_path17 = require("node:path");
     import_better_sqlite32 = __toESM(require("better-sqlite3"), 1);
     init_better_sqlite3();
     init_logger2();
@@ -42496,15 +42716,15 @@ function resumeJobWithInstruction(jobId, instruction, db = getDb()) {
 }
 
 // src/lib/repos/path.ts
-var import_node_fs11 = require("node:fs");
-var import_node_path17 = require("node:path");
+var import_node_fs12 = require("node:fs");
+var import_node_path18 = require("node:path");
 function isGitRepoPath(path2) {
   try {
-    if (!(0, import_node_fs11.statSync)(path2).isDirectory()) return false;
+    if (!(0, import_node_fs12.statSync)(path2).isDirectory()) return false;
   } catch {
     return false;
   }
-  return (0, import_node_fs11.existsSync)((0, import_node_path17.join)(path2, ".git"));
+  return (0, import_node_fs12.existsSync)((0, import_node_path18.join)(path2, ".git"));
 }
 
 // src/lib/repos/service.ts
@@ -42617,7 +42837,10 @@ var repoInputSchema = import_zod18.z.object({
   sandboxImage: import_zod18.z.string().nullish(),
   sandboxAllowNetwork: import_zod18.z.boolean().default(false),
   sandboxCpus: import_zod18.z.string().nullish(),
-  sandboxMemory: import_zod18.z.string().nullish()
+  sandboxMemory: import_zod18.z.string().nullish(),
+  // Opt-in claude-mem worktree adoption (issue #274). Off by default: it depends
+  // on the external claude-mem plugin being installed. See the schema column.
+  adoptClaudeMem: import_zod18.z.boolean().default(false)
 });
 function assertModelAllowedForAgent(agent, model, db) {
   if (agent === "openrouter") {