@telora/daemon 0.15.24 → 0.15.27

package/dist/worktree-state.d.ts

@@ -0,0 +1,58 @@
+/**
+ * Worktree write-state observation.
+ *
+ * Pure-observation helper that consolidates the four signals indicating
+ * whether a focus's worktree is currently being written to:
+ *
+ *   1. an in-memory focus team is active (phase not in shutting_down/terminated)
+ *   2. an agent_sessions DB row for the focus is in an active/starting status
+ *   3. a recent commit has landed on HEAD within a configurable threshold
+ *   4. the worktree is dirty (uncommitted changes)
+ *
+ * Used by the continuous merge-back loop to gate "is it safe to attempt
+ * merge right now?". Pure observation — no side effects, no mutations.
+ */
+export interface WorktreeWriteReason {
+    code: string;
+    message: string;
+}
+export interface WorktreeWriteSignal {
+    active: boolean;
+    reason: WorktreeWriteReason | null;
+}
+export interface WorktreeStateDeps {
+    hasActiveTeam: (focusId: string) => boolean;
+    getActiveTeamPhase: (focusId: string) => string | null;
+    getFocusWorktree: (focusId: string) => {
+        worktreePath: string;
+        branchName: string;
+    } | undefined;
+    getActiveSessionForFocus: (focusId: string) => Promise<{
+        id: string;
+        status: string;
+    } | null>;
+    worktreeHasUncommittedChanges: (worktreePath: string) => boolean;
+    getLastCommitTimestampMs: (worktreePath: string) => number | null;
+    now: () => number;
+}
+/**
+ * Observe whether a focus's worktree is currently being written.
+ *
+ * Returns a signal containing `active: true` plus the first matching reason,
+ * or `active: false` with `reason: null` when no writer is detected. The
+ * `no_worktree` case is reported as `active: false` with a non-null reason
+ * so callers can distinguish "no writer because nothing exists yet" from
+ * "no writer because everything is quiescent".
+ *
+ * Order of checks (returns on first hit):
+ *   1. in-memory active team (non-terminal phase) -> active_team
+ *   2. no persistent worktree -> { active: false, no_worktree }
+ *   3. DB session row in active/starting status -> active_session
+ *   4. recent commit within threshold -> recent_commit
+ *   5. dirty worktree -> dirty_worktree
+ *   6. otherwise -> { active: false, null }
+ */
+export declare function isWorktreeBeingWritten(focusId: string, opts?: {
+    recentCommitThresholdMs?: number;
+}, deps?: Partial<WorktreeStateDeps>): Promise<WorktreeWriteSignal>;
+//# sourceMappingURL=worktree-state.d.ts.map

package/dist/worktree-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-state.d.ts","sourceRoot":"","sources":["../src/worktree-state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAQH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAAC;CACpC;AAED,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IAC5C,kBAAkB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IACvD,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IAChG,wBAAwB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IAC9F,6BAA6B,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC;IACjE,wBAAwB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAClE,GAAG,EAAE,MAAM,MAAM,CAAC;CACnB;AAoCD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,IAAI,GAAE;IAAE,uBAAuB,CAAC,EAAE,MAAM,CAAA;CAAO,EAC/C,IAAI,GAAE,OAAO,CAAC,iBAAiB,CAAM,GACpC,OAAO,CAAC,mBAAmB,CAAC,CAmE9B"}

package/dist/worktree-state.js

@@ -0,0 +1,135 @@
+/**
+ * Worktree write-state observation.
+ *
+ * Pure-observation helper that consolidates the four signals indicating
+ * whether a focus's worktree is currently being written to:
+ *
+ *   1. an in-memory focus team is active (phase not in shutting_down/terminated)
+ *   2. an agent_sessions DB row for the focus is in an active/starting status
+ *   3. a recent commit has landed on HEAD within a configurable threshold
+ *   4. the worktree is dirty (uncommitted changes)
+ *
+ * Used by the continuous merge-back loop to gate "is it safe to attempt
+ * merge right now?". Pure observation — no side effects, no mutations.
+ */
+import { hasActiveTeam, getActiveTeams } from './focus-team-state.js';
+import { getFocusWorktree } from './focus-worktree-state.js';
+import { worktreeHasUncommittedChanges } from './worktree-safety.js';
+import { runGitSync } from './git-types.js';
+import { getActiveSessionForFocus } from './queries/sessions.js';
+const DEFAULT_RECENT_COMMIT_THRESHOLD_MS = 30_000;
+/**
+ * Read the unix-epoch milliseconds timestamp of the worktree's HEAD commit.
+ * Returns null on any failure (git error, non-numeric output, missing repo).
+ */
+function defaultGetLastCommitTimestampMs(worktreePath) {
+    try {
+        const result = runGitSync(['log', '-1', '--format=%ct', 'HEAD'], worktreePath);
+        if (!result.success)
+            return null;
+        const trimmed = result.output.trim();
+        if (trimmed.length === 0)
+            return null;
+        const seconds = Number.parseInt(trimmed, 10);
+        if (!Number.isFinite(seconds) || Number.isNaN(seconds))
+            return null;
+        return seconds * 1000;
+    }
+    catch {
+        return null;
+    }
+}
+const defaultDeps = {
+    hasActiveTeam,
+    getActiveTeamPhase: (focusId) => getActiveTeams().get(focusId)?.phase ?? null,
+    getFocusWorktree: (focusId) => {
+        const info = getFocusWorktree(focusId);
+        if (!info)
+            return undefined;
+        return { worktreePath: info.worktreePath, branchName: info.branchName };
+    },
+    getActiveSessionForFocus,
+    worktreeHasUncommittedChanges,
+    getLastCommitTimestampMs: defaultGetLastCommitTimestampMs,
+    now: () => Date.now(),
+};
+/**
+ * Observe whether a focus's worktree is currently being written.
+ *
+ * Returns a signal containing `active: true` plus the first matching reason,
+ * or `active: false` with `reason: null` when no writer is detected. The
+ * `no_worktree` case is reported as `active: false` with a non-null reason
+ * so callers can distinguish "no writer because nothing exists yet" from
+ * "no writer because everything is quiescent".
+ *
+ * Order of checks (returns on first hit):
+ *   1. in-memory active team (non-terminal phase) -> active_team
+ *   2. no persistent worktree -> { active: false, no_worktree }
+ *   3. DB session row in active/starting status -> active_session
+ *   4. recent commit within threshold -> recent_commit
+ *   5. dirty worktree -> dirty_worktree
+ *   6. otherwise -> { active: false, null }
+ */
+export async function isWorktreeBeingWritten(focusId, opts = {}, deps = {}) {
+    const d = { ...defaultDeps, ...deps };
+    const thresholdMs = opts.recentCommitThresholdMs ?? DEFAULT_RECENT_COMMIT_THRESHOLD_MS;
+    // 1. In-memory active team
+    if (d.hasActiveTeam(focusId)) {
+        const phase = d.getActiveTeamPhase(focusId);
+        if (phase !== null && phase !== 'shutting_down' && phase !== 'terminated') {
+            return {
+                active: true,
+                reason: {
+                    code: 'active_team',
+                    message: `in-memory team phase=${phase}`,
+                },
+            };
+        }
+    }
+    // 2. No persistent worktree
+    const worktree = d.getFocusWorktree(focusId);
+    if (!worktree) {
+        return {
+            active: false,
+            reason: { code: 'no_worktree', message: 'focus has no worktree' },
+        };
+    }
+    // 3. Active DB session for this focus
+    const session = await d.getActiveSessionForFocus(focusId);
+    if (session && (session.status === 'active' || session.status === 'starting')) {
+        return {
+            active: true,
+            reason: {
+                code: 'active_session',
+                message: `agent_sessions row ${session.id} is status=${session.status}`,
+            },
+        };
+    }
+    // 4. Recent commit
+    const lastCommitMs = d.getLastCommitTimestampMs(worktree.worktreePath);
+    if (lastCommitMs !== null) {
+        const ageMs = d.now() - lastCommitMs;
+        if (ageMs >= 0 && ageMs <= thresholdMs) {
+            return {
+                active: true,
+                reason: {
+                    code: 'recent_commit',
+                    message: `last commit ${ageMs}ms ago`,
+                },
+            };
+        }
+    }
+    // 5. Dirty worktree
+    if (d.worktreeHasUncommittedChanges(worktree.worktreePath)) {
+        return {
+            active: true,
+            reason: {
+                code: 'dirty_worktree',
+                message: 'git status --porcelain non-empty',
+            },
+        };
+    }
+    // 6. Quiescent
+    return { active: false, reason: null };
+}
+//# sourceMappingURL=worktree-state.js.map

package/dist/worktree-state.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telora/daemon",
-  "version": "0.15.24",
+  "version": "0.15.27",
   "description": "Agent orchestration daemon for Telora - spawns and manages Claude Code instances",
   "type": "module",
   "bin": {
@@ -35,7 +35,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. See src/__tests__/ for test files.",
   "dependencies": {
-    "@telora/daemon-core": "^0.2.16",
+    "@telora/daemon-core": "^0.2.17",
     "@telora/mcp-products": "^0.22.1",
     "commander": "^14.0.3",
     "zod": "^4.3.6"