@telora/daemon 0.22.132 → 0.22.136

package/dist/worktree/scratch-guard.js

@@ -1,6 +1,8 @@
 // PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
 // Pinned by: packages/daemon/src/worktree/safety-commit-guard.test.ts,
 //   packages/daemon/src/worktree/scratch-guard.test.ts,
+//   packages/daemon/src/worktree/unmerged-capture-escalation.test.ts,
+//   packages/daemon/src/worktree/unmerged-capture-refusal.test.ts,
 //   packages/daemon/src/worktree/verify-interlock.test.ts,
 //   packages/daemon/src/worktree/worktree-identity-redirect.test.ts
 // PINNED-BY-END
@@ -28,7 +30,7 @@ import { loadEnvConfig } from '@telora/daemon-core';
 import { runGitSync } from '../git/index.js';
 import { assertWorktreeIdentity, defaultWorktreeIdentityViolationReporter, } from './identity.js';
 import { isWorktreeUnderVerify } from './verify-interlock.js';
-import { DELIVERY_TRAILER_KEY, NON_DELIVERY_SENTINEL } from '../resolvers/shared/git-diff.js';
+import { DELIVERY_TRAILER_KEY, NON_DELIVERY_SENTINEL, UNATTRIBUTED_CAPTURE_SENTINEL, } from '../resolvers/shared/delivery-trailer.js';
 import { createLogger } from '../shell/log.js';
 const log = createLogger({ module: 'worktree' });
 /** Conservative default sweep ceiling for a single automated commit. */
@@ -321,15 +323,118 @@ export const defaultSweepRefusalReporter = (r) => {
         `exceeds the ${r.maxFiles}-file sweep threshold. Working tree left untouched. ` +
         `Sample: ${r.sample.join(', ')}`);
 };
+/** Bound on the unmerged paths named in a refusal report. */
+const UNMERGED_SAMPLE_MAX = 20;
+/** Default reporter: loudly name the worktree and the unmerged paths. */
+export const defaultUnmergedPathsReporter = (r) => {
+    log.error(`REFUSING daemon commit for "${r.context}" at ${r.worktreePath}: ` +
+        (r.error !== undefined
+            ? `could not list unmerged paths (${r.error}). `
+            : `${r.count} unmerged path(s) -- an unresolved merge conflict. `) +
+        `Nothing staged or committed; conflict left intact. Paths: ${r.paths.join(', ')}`);
+};
+/**
+ * The distinct paths git records as unmerged (`git ls-files -u`), or the git
+ * error. Staging an unmerged path marks it resolved, so a commit made after
+ * staging would carry the conflict markers (Tinker Tailor c31d8ed5).
+ */
+export function listUnmergedPaths(worktreePath) {
+    const res = runGitSync(['ls-files', '-u', '-z'], worktreePath);
+    if (!res.success)
+        return { ok: false, error: res.error || 'git ls-files -u failed' };
+    // -z entries: "<mode> <sha> <stage>\t<path>" separated by NUL.
+    const paths = new Set();
+    for (const entry of res.output.split('\0')) {
+        const tab = entry.indexOf('\t');
+        if (tab >= 0)
+            paths.add(entry.slice(tab + 1));
+    }
+    return { ok: true, paths: [...paths] };
+}
+/**
+ * Refuse (report and return true) when the worktree has unmerged paths or they
+ * cannot be listed -- a daemon commit must never stage a conflict as resolved.
+ */
+function refuseUnmergedPaths(worktreePath, context, reporter) {
+    const unmerged = listUnmergedPaths(worktreePath);
+    if (unmerged.ok && unmerged.paths.length === 0)
+        return false;
+    reporter(unmerged.ok
+        ? { worktreePath, context, count: unmerged.paths.length, paths: unmerged.paths.slice(0, UNMERGED_SAMPLE_MAX) }
+        : { worktreePath, context, count: 0, paths: [], error: unmerged.error });
+    return true;
+}
+/**
+ * Commit what is staged (or only `paths`, when given) with a Telora-Delivery
+ * trailer and return the new HEAD sha, or null when git refused or produced no
+ * commit (logged by cause).
+ */
+function commitStaged(worktreePath, message, context, trailerValue, paths) {
+    // Stamp attribution as a git TRAILER (not a `-m` paragraph): the
+    // delivery-trailer commit-msg guard installed on every writable worktree
+    // REFUSES a commit without one, silently losing the very work this commit
+    // exists to preserve, and a `-m` trailer paragraph would itself be voided by
+    // git's `--trailer` insertion. With paths, `git commit -- <paths>` records
+    // only those paths (literal pathspecs: a filename is never read as a glob).
+    const pathspec = paths ? ['--', ...paths.map((p) => `:(literal)${p}`)] : [];
+    const commitResult = runGitSync(['commit', '-m', message, '--trailer', `${DELIVERY_TRAILER_KEY}: ${trailerValue}`, ...pathspec], worktreePath);
+    if (!commitResult.success) {
+        // Do NOT guess the cause: a guard refusal and a genuinely-empty commit used
+        // to emit the identical "(may be empty)" line, which is exactly what made
+        // the trailer-guard refusal invisible. Classify by git's own output.
+        const detail = `${commitResult.output}\n${commitResult.error}`;
+        const nothingToCommit = /nothing to commit|no changes added|working tree clean/i.test(detail);
+        if (nothingToCommit) {
+            log.warn(`guardedCommit: nothing to commit for "${context}" at ${worktreePath} ` +
+                `(staged tree produced no commit): ${commitResult.error || commitResult.output}`);
+        }
+        else {
+            log.warn(`guardedCommit: commit REFUSED for "${context}" at ${worktreePath} -- a git hook ` +
+                `rejected the daemon-authored commit and the work was NOT preserved. git stderr: ` +
+                `${commitResult.error || '(no stderr)'}`);
+        }
+        return null;
+    }
+    const hashResult = runGitSync(['rev-parse', 'HEAD'], worktreePath);
+    return hashResult.success ? hashResult.output : null;
+}
+/**
+ * Commit the staged set under its attribution: one commit per group, each
+ * recording only its paths. Whatever is still staged afterwards (a rename's old
+ * path, a group whose commit failed) is committed as unattributed delivery work
+ * rather than left behind. Returns the last commit's sha, or null when none landed.
+ */
+function commitStagedAttributed(worktreePath, message, context, staged, attribution) {
+    const groups = attribution ? attribution(staged).filter((g) => g.paths.length > 0) : [];
+    const [only] = groups;
+    if (groups.length <= 1) {
+        return commitStaged(worktreePath, message, context, only?.trailerValue ?? NON_DELIVERY_SENTINEL);
+    }
+    let last = null;
+    for (const group of groups) {
+        last = commitStaged(worktreePath, message, context, group.trailerValue, group.paths) ?? last;
+    }
+    const rest = runGitSync(['diff', '--cached', '--name-only', 'HEAD'], worktreePath);
+    if (rest.success && rest.output.trim() !== '') {
+        last = commitStaged(worktreePath, message, context, UNATTRIBUTED_CAPTURE_SENTINEL) ?? last;
+    }
+    return last;
+}
 /**
  * Stage (scratch-excluded, sweep-guarded) and commit a daemon-authored commit.
  * The ONE implementation every daemon safety/WIP/lockfile commit routes
  * through, so none can stage `.telora/` scratch or sweep the tree.
  *
+ * With `attribution`, the staged set is committed as one commit per attribution
+ * group, each carrying its group's Telora-Delivery trailer; without it, as one
+ * commit carrying the non-delivery sentinel.
+ *
  * Returns the commit sha on success, or null when there was nothing to commit
  * (clean or scratch-only tree), the worktree failed the identity check, the
- * sweep was refused, or a git op failed. On a threshold refusal the working
- * tree is left untouched and the reporter is invoked exactly once.
+ * sweep was refused, the worktree has unmerged paths, or a git op failed. On a
+ * threshold refusal the working tree is left untouched and the reporter is
+ * invoked exactly once; on an unmerged-paths refusal nothing is staged and the
+ * unmerged reporter is invoked exactly once.
  *
  * Identity is asserted BEFORE any staging: if the directory is not the worktree
  * it names (e.g. a `.git`-less checkout whose git commands resolve at the
@@ -364,6 +469,12 @@ export function guardedCommit(params) {
         });
         return null;
     }
+    // Unmerged-paths gate: staging an unmerged path records it as resolved, so a
+    // capture taken mid-conflict would commit the conflict markers. Refuse before
+    // staging; the conflict stays in the index for whoever resolves it.
+    if (refuseUnmergedPaths(worktreePath, context, params.unmergedReporter ?? defaultUnmergedPathsReporter)) {
+        return null;
+    }
     const stage = stageExcludingDaemonScratch(worktreePath, params.options);
     if (stage.kind === 'error') {
         log.warn(`guardedCommit: staging failed for "${context}": ${stage.message}`);
@@ -394,32 +505,6 @@ export function guardedCommit(params) {
         // Clean or scratch-only tree -- nothing non-scratch to commit.
         return null;
     }
-    // Stamp the non-delivery sentinel as a git TRAILER (not a `-m` paragraph): a
-    // daemon housekeeping commit belongs to no delivery, so it declares that with
-    // `Telora-Delivery: none` rather than omitting attribution -- which the
-    // delivery-trailer commit-msg guard installed on every writable worktree would
-    // REFUSE, silently losing the very work this commit exists to preserve. A `-m`
-    // trailer paragraph would itself be voided by git's `--trailer` insertion, so
-    // the sentinel must go through git's own trailer machinery to survive the read.
-    const commitResult = runGitSync(['commit', '-m', message, '--trailer', `${DELIVERY_TRAILER_KEY}: ${NON_DELIVERY_SENTINEL}`], worktreePath);
-    if (!commitResult.success) {
-        // Do NOT guess the cause: a guard refusal and a genuinely-empty commit used
-        // to emit the identical "(may be empty)" line, which is exactly what made
-        // the trailer-guard refusal invisible. Classify by git's own output.
-        const detail = `${commitResult.output}\n${commitResult.error}`;
-        const nothingToCommit = /nothing to commit|no changes added|working tree clean/i.test(detail);
-        if (nothingToCommit) {
-            log.warn(`guardedCommit: nothing to commit for "${context}" at ${worktreePath} ` +
-                `(staged tree produced no commit): ${commitResult.error || commitResult.output}`);
-        }
-        else {
-            log.warn(`guardedCommit: commit REFUSED for "${context}" at ${worktreePath} -- a git hook ` +
-                `rejected the daemon-authored commit and the work was NOT preserved. git stderr: ` +
-                `${commitResult.error || '(no stderr)'}`);
-        }
-        return null;
-    }
-    const hashResult = runGitSync(['rev-parse', 'HEAD'], worktreePath);
-    return hashResult.success ? hashResult.output : null;
+    return commitStagedAttributed(worktreePath, message, context, stage.staged, params.attribution);
 }
 //# sourceMappingURL=scratch-guard.js.map

package/dist/worktree/scratch-guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"scratch-guard.js","sourceRoot":"","sources":["../../src/worktree/scratch-guard.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scratch-guard.js","sourceRoot":"","sources":["../../src/worktree/scratch-guard.ts"],"names":[],"mappings":"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"}

package/dist/worktree/unmerged-capture-escalation.d.ts

@@ -0,0 +1,52 @@
+/**
+ * The escalation a refused capture files when a worktree is mid-conflict.
+ *
+ * guardedCommit refuses to stage or commit while `git ls-files -u` is non-empty
+ * (staging an unmerged path records the conflict as resolved -- Tinker Tailor
+ * c31d8ed5 committed its markers that way). A refusal leaves the agent's work
+ * uncommitted in a conflicted worktree, so it must not stop at a log line: this
+ * reporter files ONE agent_resolvable escalation per worktree naming the focus,
+ * the worktree and the unmerged paths. The cause key is scoped to the worktree
+ * path, so every later exit that refuses the same worktree is suppressed while
+ * the first filing is open.
+ *
+ * The reporter the capture path calls is synchronous; the filing is async, so
+ * the reporter starts it and `flush()` awaits every filing it started. Filing
+ * never throws into the capture path -- a failure is logged. The filing chain is
+ * loaded lazily so a test that registers mock.module and imports a capture call
+ * site does not also load it (see the mock-loader note in packages/daemon/CLAUDE.md).
+ */
+import type { FileEscalationIdempotentParams, FileEscalationIdempotentResult } from '../queries/escalation-suppression.js';
+import type { UnmergedPathsReport, UnmergedPathsReporter } from './scratch-guard.js';
+/** The cause-key kind every unmerged-capture escalation carries. */
+export declare const UNMERGED_CAPTURE_CAUSE_KIND = "capture_refused_unmerged_paths";
+/** Where the refused capture came from. */
+export interface UnmergedCaptureContext {
+    organizationId: string;
+    focusId: string | null;
+    productId: string | null;
+    /** Focus (or delivery) name, for the description. */
+    focusName: string;
+}
+export interface UnmergedCaptureEscalationDeps {
+    fileEscalation: (params: FileEscalationIdempotentParams) => Promise<FileEscalationIdempotentResult>;
+}
+/** A capture reporter plus a way to await the filings it started. */
+export interface UnmergedCaptureEscalationReporter {
+    reporter: UnmergedPathsReporter;
+    flush: () => Promise<void>;
+    /**
+     * After `flush`: a refusal was reported and its escalation is open (filed now,
+     * or already open). The conflict then has its signal, so a caller skips its own
+     * generic escalation for the same uncaptured work. False when no refusal was
+     * reported or its filing failed, so the caller's fallback still surfaces it.
+     */
+    escalated: () => boolean;
+}
+/** The cause key for a refused capture of one worktree. */
+export declare function unmergedCaptureCauseKey(worktreePath: string): string;
+/** Pure: the escalation filed for one refusal. */
+export declare function buildUnmergedCaptureEscalation(ctx: UnmergedCaptureContext, report: UnmergedPathsReport): FileEscalationIdempotentParams;
+/** A reporter that files the escalation for each refusal it sees. */
+export declare function createUnmergedCaptureEscalationReporter(ctx: UnmergedCaptureContext, deps?: Partial<UnmergedCaptureEscalationDeps>): UnmergedCaptureEscalationReporter;
+//# sourceMappingURL=unmerged-capture-escalation.d.ts.map

package/dist/worktree/unmerged-capture-escalation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unmerged-capture-escalation.d.ts","sourceRoot":"","sources":["../../src/worktree/unmerged-capture-escalation.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EACV,8BAA8B,EAC9B,8BAA8B,EAC/B,MAAM,sCAAsC,CAAC;AAI9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAIrF,oEAAoE;AACpE,eAAO,MAAM,2BAA2B,mCAAmC,CAAC;AAE5E,2CAA2C;AAC3C,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,qDAAqD;IACrD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,6BAA6B;IAC5C,cAAc,EAAE,CAAC,MAAM,EAAE,8BAA8B,KAAK,OAAO,CAAC,8BAA8B,CAAC,CAAC;CACrG;AAED,qEAAqE;AACrE,MAAM,WAAW,iCAAiC;IAChD,QAAQ,EAAE,qBAAqB,CAAC;IAChC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B;;;;;OAKG;IACH,SAAS,EAAE,MAAM,OAAO,CAAC;CAC1B;AAED,2DAA2D;AAC3D,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,kDAAkD;AAClD,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,sBAAsB,EAC3B,MAAM,EAAE,mBAAmB,GAC1B,8BAA8B,CAwBhC;AASD,qEAAqE;AACrE,wBAAgB,uCAAuC,CACrD,GAAG,EAAE,sBAAsB,EAC3B,IAAI,GAAE,OAAO,CAAC,6BAA6B,CAAM,GAChD,iCAAiC,CA2BnC"}

package/dist/worktree/unmerged-capture-escalation.js

@@ -0,0 +1,64 @@
+// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
+// Pinned by: packages/daemon/src/shell/safety-capture-entry-points.test.ts,
+//   packages/daemon/src/worktree/unmerged-capture-escalation.test.ts
+// PINNED-BY-END
+import { DISPOSITION_AGENT_RESOLVABLE } from '../queries/escalation-dispositions.js';
+import { computeCauseKey } from '../queries/cause-key.js';
+import { createLogger } from '../shell/log.js';
+const log = createLogger({ module: 'worktree' });
+/** The cause-key kind every unmerged-capture escalation carries. */
+export const UNMERGED_CAPTURE_CAUSE_KIND = 'capture_refused_unmerged_paths';
+/** The cause key for a refused capture of one worktree. */
+export function unmergedCaptureCauseKey(worktreePath) {
+    return computeCauseKey(UNMERGED_CAPTURE_CAUSE_KIND, { worktreePath });
+}
+/** Pure: the escalation filed for one refusal. */
+export function buildUnmergedCaptureEscalation(ctx, report) {
+    const listing = report.error !== undefined
+        ? `The unmerged paths could not be listed (\`git ls-files -u\` failed: ${report.error}).`
+        : `Unmerged paths (${report.count}${report.count > report.paths.length ? `, first ${report.paths.length}` : ''}):\n` +
+            report.paths.map((p) => `- ${p}`).join('\n');
+    return {
+        organizationId: ctx.organizationId,
+        issueId: null,
+        reasonType: 'error_encountered',
+        disposition: DISPOSITION_AGENT_RESOLVABLE,
+        ...(ctx.focusId ? { focusId: ctx.focusId } : {}),
+        ...(ctx.productId ? { productId: ctx.productId } : {}),
+        causeKey: unmergedCaptureCauseKey(report.worktreePath),
+        description: `The daemon refused to capture uncommitted work for "${ctx.focusName}" because the worktree ` +
+            `has an unresolved merge conflict. Committing it would have recorded the conflict markers as ` +
+            `resolved, so nothing was staged or committed and the conflict is left intact.\n\n` +
+            `Worktree: ${report.worktreePath}\n${listing}`,
+        whatWasTried: `Capture ("${report.context}") checked \`git ls-files -u\` before staging and refused.`,
+        helpNeeded: 'Resolve the merge conflict in the worktree (or abort the merge), then commit the work with its ' +
+            'Telora-Delivery trailer so it is not lost.',
+        metadata: { worktree_path: report.worktreePath, unmerged_paths: report.paths },
+    };
+}
+async function defaultFileEscalation(params) {
+    const { fileEscalationIdempotent } = await import('../queries/escalation-suppression.js');
+    return fileEscalationIdempotent(params);
+}
+/** A reporter that files the escalation for each refusal it sees. */
+export function createUnmergedCaptureEscalationReporter(ctx, deps = {}) {
+    const file = deps.fileEscalation ?? defaultFileEscalation;
+    const pending = [];
+    let escalated = false;
+    const reporter = (report) => {
+        log.error(`Capture refused for "${ctx.focusName}" at ${report.worktreePath}: unresolved merge conflict ` +
+            `(${report.error ?? report.paths.join(', ')}). Filing an escalation.`);
+        pending.push(Promise.resolve()
+            .then(() => file(buildUnmergedCaptureEscalation(ctx, report)))
+            .then((result) => {
+            escalated = true;
+            if (result.suppressed)
+                log.info(`Unmerged-capture escalation for ${report.worktreePath} already open; not re-filed`);
+        }, (err) => {
+            log.warn(`Failed to file unmerged-capture escalation for ${report.worktreePath}: ` +
+                `${err instanceof Error ? err.message : String(err)}`);
+        }));
+    };
+    return { reporter, flush: async () => { await Promise.all(pending); }, escalated: () => escalated };
+}
+//# sourceMappingURL=unmerged-capture-escalation.js.map

package/dist/worktree/unmerged-capture-escalation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unmerged-capture-escalation.js","sourceRoot":"","sources":["../../src/worktree/unmerged-capture-escalation.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telora/daemon",
-  "version": "0.22.132",
+  "version": "0.22.136",
   "description": "Agent orchestration daemon for Telora - spawns and manages Claude Code instances",
   "type": "module",
   "bin": {
@@ -38,7 +38,7 @@
   "//testRunner": "Uses Node.js built-in test runner (node:test) via tsx for TypeScript support. The root package uses Vitest; this is a deliberate choice for the daemon package to avoid framework dependencies. Test files live beside the modules they exercise (owner-directory layout); the runner discovers them recursively.",
   "dependencies": {
     "@telora/daemon-core": "^0.2.97",
-    "@telora/mcp-products": "^0.22.148",
+    "@telora/mcp-products": "^0.22.150",
     "commander": "^14.0.3",
     "yaml": "^2.4.0",
     "zod": "^4.3.6"