@deftai/directive-core 0.90.0 → 0.92.0

package/dist/session/session-start.js

@@ -3,12 +3,14 @@ import { runningInsideDeftRepo } from "../doctor/paths.js";
 import { emitSessionEvalReadback } from "../eval/readback.js";
 import { MIGRATE_COMPLETION_NUDGE, shouldEmitMigrateNudge } from "../init-deposit/migrate.js";
 import { detectEnvironmentContext, environmentContextToDict, formatEnvironmentContext, } from "../platform/shell-context.js";
+import { DEFT_DIRECTIVE_DISABLE_FLAG_NAME, DEFT_DIRECTIVE_DISABLE_STATUS, detectDeftDirectiveDisable, formatDeftDirectiveDisableMessage, isDeftDirectiveDisableActive, } from "../policy/deft-directive-disable.js";
 import { disclosureLine } from "../policy/disclosure.js";
 import { detectNoDeftDirective, NO_DEFT_DIRECTIVE_DISABLED_MESSAGE, NO_DEFT_DIRECTIVE_FLAG_NAME, NO_DEFT_DIRECTIVE_INCONSISTENT_MESSAGE, NO_DEFT_DIRECTIVE_INCONSISTENT_POLICY, } from "../policy/no-deft-directive.js";
 import { humanMergeDisclosureLine, resolveHumanMergePolicy, } from "../policy/require-human-merge.js";
 import { resolvePolicy } from "../policy/resolve.js";
 import { maybeFormatProductSignalConsentPrompt } from "../product-signal/consent-prompt.js";
 import { formatFrameworkCommand } from "../render/framework-commands.js";
+import { formatScmReadinessLines, probeScmReadiness, scmReadinessToDict, } from "../scm/readiness.js";
 import { maybeRunStalenessTickler } from "../staleness-tickler/run.js";
 import { runDefaultMode } from "../triage/welcome/default-mode.js";
 import { resolveUserMdPath } from "../user-config/resolve-user-md.js";
@@ -292,6 +294,44 @@ export function defaultBranchSync(projectRoot, runGit = defaultGitRunner) {
     }
     return { branch, upstream, ahead, behind, warning };
 }
+/**
+ * Resolve SCM readiness for session orientation (#2275).
+ * Shallow by default (PATH + auth status); deep when optional network is on.
+ * Never throws — session:start must not hard-block on SCM absence.
+ */
+function resolveSessionScmReadiness(options, allowOptionalNetwork) {
+    const probe = options.probeScm ?? probeScmReadiness;
+    try {
+        return probe({
+            depth: allowOptionalNetwork ? "deep" : "shallow",
+            env: options.env,
+        });
+    }
+    catch {
+        return {
+            ready: false,
+            binary: null,
+            binaryPath: null,
+            authState: "unknown",
+            githubAuthMode: "host-gh",
+            runtimeMode: "local-unsandboxed",
+            injectedTokenPresent: false,
+            depth: allowOptionalNetwork ? "deep" : "shallow",
+            detail: "SCM readiness probe failed unexpectedly; treating SCM-dependent gates as skipped",
+            remediation: null,
+            skippedGates: [
+                "triage:queue",
+                "issue:ingest",
+                "pr:*",
+                "reconcile:issues",
+                "cache:fetch-all",
+                "scm:*",
+            ],
+            login: null,
+            failureKind: "probe_error",
+        };
+    }
+}
 function runReadOnlySessionStart(projectRoot, options, instant, environment) {
     const lines = [];
     const resolveUserMd = options.resolveUserMd ?? ((root) => resolveUserMdPath({ projectRoot: root }));
@@ -301,9 +341,12 @@ function runReadOnlySessionStart(projectRoot, options, instant, environment) {
     const userMdLine = userMd.found
         ? `USER.md resolved (${userMd.rung}): ${safePath}`
         : safeDiagnostic;
+    // #2275: report SCM availability even on read-only alignment (shallow; no network).
+    const scm = resolveSessionScmReadiness(options, false);
     lines.push(READ_ONLY_ALIGNMENT_MESSAGE);
     lines.push(userMdLine);
     lines.push(formatEnvironmentContext(environment));
+    lines.push(...formatScmReadinessLines(scm));
     const resultPayload = {
         ready: true,
         exit_code: 0,
@@ -324,6 +367,7 @@ function runReadOnlySessionStart(projectRoot, options, instant, environment) {
             diagnostic: userMd.diagnostic,
         },
         environment: environmentContextToDict(environment),
+        scm: scmReadinessToDict(scm),
         message: READ_ONLY_RESULT_MESSAGE,
     };
     return { code: 0, payload: resultPayload, lines };
@@ -364,10 +408,13 @@ function runSessionRearm(projectRoot, options, instant, environment) {
         ? `USER.md resolved (${userMd.rung}): ${safePath}`
         : safeDiagnostic;
     const alignmentMessage = `${READ_ONLY_ALIGNMENT_MESSAGE} ${userMdLine}`;
+    // #2275: re-arm still reports SCM state (shallow; no network).
+    const scm = resolveSessionScmReadiness(options, false);
     const lines = [
         READ_ONLY_ALIGNMENT_MESSAGE,
         userMdLine,
         formatEnvironmentContext(environment),
+        ...formatScmReadinessLines(scm),
         REARM_SKIPPED_FAT_PATH_MESSAGE,
     ];
     // Light branch-policy disclosure (local only) so re-arm still surfaces policy state.
@@ -484,6 +531,7 @@ function runSessionRearm(projectRoot, options, instant, environment) {
                 diagnostic: userMd.diagnostic,
             },
             environment: environmentContextToDict(environment),
+            scm: scmReadinessToDict(scm),
             message: code === 0 ? "session ritual re-armed" : "session ritual re-arm failed",
         },
         lines,
@@ -496,6 +544,36 @@ export function runSessionStart(projectRoot, options = {}) {
     const runGit = options.runGit ?? defaultGitRunner;
     const environment = (options.probeEnvironment ?? detectEnvironmentContext)();
     const ceremonyTier = options.ceremonyTier ?? COLD_CEREMONY_TIER;
+    // #3039: local (untracked) test kill-switch — skip ritual write; deposit may remain.
+    // Recovery requires delete + new session. Tracked flags do not short-circuit.
+    if (isDeftDirectiveDisableActive(projectRoot)) {
+        const killSwitch = detectDeftDirectiveDisable(projectRoot);
+        const optOutAlso = detectNoDeftDirective(projectRoot);
+        const message = formatDeftDirectiveDisableMessage({
+            permanentOptOutAlsoPresent: optOutAlso.present,
+            trackedByGit: false,
+        });
+        const lines = message.split("\n");
+        return {
+            code: 0,
+            payload: {
+                ready: false,
+                exit_code: 0,
+                disabled: true,
+                disabled_via: DEFT_DIRECTIVE_DISABLE_FLAG_NAME,
+                status: DEFT_DIRECTIVE_DISABLE_STATUS,
+                kill_switch: true,
+                inconsistent: false,
+                deposit_present: killSwitch.depositPresent,
+                tracked_by_git: false,
+                permanent_opt_out_also_present: optOutAlso.present,
+                posture,
+                environment: environmentContextToDict(environment),
+                message,
+            },
+            lines,
+        };
+    }
     // #2926: official root opt-out wins locally — skip Directive session ritual.
     // disabled = skip ritual (exit 0 clean / 1 inconsistent). ready stays false so
     // automation does not treat opt-out as "session fully initialized for work".
@@ -594,6 +672,12 @@ export function runSessionStart(projectRoot, options = {}) {
         stepTimings.push({ name: "alignment", duration_ms: 0, skipped: true });
     }
     lines.push(formatEnvironmentContext(environment));
+    // #2275: SCM tooling + auth readiness — shallow on hot path, deep with --with-network.
+    // Never fails session:start; reports which SCM-dependent gates are skipped.
+    const scmStepStarted = performance.now();
+    const scm = resolveSessionScmReadiness(options, allowOptionalNetwork);
+    lines.push(...formatScmReadinessLines(scm));
+    stepTimings.push({ name: "scm_readiness", duration_ms: elapsedMs(scmStepStarted) });
     if (!quickSteps.branch_policy) {
         const stepStarted = performance.now();
         const result = resolvePolicy(projectRoot);
@@ -793,6 +877,7 @@ export function runSessionStart(projectRoot, options = {}) {
             diagnostic: userMd.diagnostic,
         },
         environment: environmentContextToDict(environment),
+        scm: scmReadinessToDict(scm),
         message: code === 0 ? "session ritual recorded" : "session ritual failed",
     };
     // #2994: local process-cost event (best-effort; never blocks ceremony).

package/dist/swarm/complete-cohort.d.ts

@@ -1,3 +1,14 @@
+import { type DeliveryEvidenceInput, type NonDeliveryDisposition } from "../scope/delivery-evidence.js";
+/** Per-story or default delivery evidence for cohort completion (#3041). */
+export interface CohortDeliveryContext {
+    /** Evidence keyed by absolute story path (preferred). */
+    readonly evidenceByPath?: ReadonlyMap<string, DeliveryEvidenceInput> | null;
+    /** Shared evidence applied to every story when per-path map misses. */
+    readonly defaultEvidence?: DeliveryEvidenceInput | null;
+    readonly nonDeliveryDisposition?: NonDeliveryDisposition | null;
+    readonly assumeEvidenceValidated?: boolean;
+    readonly verifier?: string;
+}
 export interface TransitionRecord {
     kind: "story" | "epic";
     path: string;
@@ -17,7 +28,13 @@ export declare function resolveCohortPaths(positional: readonly string[], cohort
     paths: string[];
     errors: string[];
 };
-export declare function sweepCohort(storyPaths: readonly string[], projectRoot: string, dryRun: boolean): SweepResult;
+export interface SweepCohortArgs {
+    readonly storyPaths: readonly string[];
+    readonly projectRoot: string;
+    readonly dryRun: boolean;
+    readonly delivery?: CohortDeliveryContext | null;
+}
+export declare function sweepCohort(storyPaths: readonly string[], projectRoot: string, dryRun: boolean, delivery?: CohortDeliveryContext | null): SweepResult;
 export declare function sweepResultToDict(result: SweepResult): Record<string, unknown>;
 export declare function renderSweepText(result: SweepResult): string;
 export declare function completeCohort(args: {
@@ -26,6 +43,8 @@ export declare function completeCohort(args: {
     projectRoot: string;
     dryRun?: boolean;
     emitJson?: boolean;
+    /** Per-story delivery evidence; without it code-bearing stories fail closed (#3041). */
+    delivery?: CohortDeliveryContext | null;
 }): {
     exitCode: number;
     stdout: string;

package/dist/swarm/complete-cohort.js

@@ -2,6 +2,7 @@ import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, resolve } from "node:path";
 import { hasArtifactSuffix, resolveLifecycleRoot } from "../layout/resolve.js";
 import { detectLifecycleFolder } from "../scope/decomposed-refs.js";
+import { classifyStoredDeliveryDisposition, } from "../scope/delivery-evidence.js";
 import { runTransition } from "../scope/transition.js";
 import { collectChildUris, collectPlanRefs, resolveVbriefRef } from "../scope/vbrief-ref.js";
 import { MAX_FIXPOINT_PASSES, TERMINAL_FOLDERS } from "./constants.js";
@@ -115,17 +116,38 @@ function parentCandidatesFrom(plan, vbriefDir) {
     }
     return out;
 }
-function completeStory(storyPath, vbriefDir, projectRoot, settled, dryRun) {
+function transitionOptionsFor(storyPath, delivery) {
+    if (delivery === null || delivery === undefined) {
+        return { verifier: "swarm:complete-cohort" };
+    }
+    const pathKey = resolve(storyPath);
+    const evidence = delivery.evidenceByPath?.get(pathKey) ??
+        delivery.evidenceByPath?.get(storyPath) ??
+        delivery.defaultEvidence ??
+        null;
+    return {
+        deliveryEvidence: evidence,
+        nonDeliveryDisposition: delivery.nonDeliveryDisposition,
+        assumeEvidenceValidated: delivery.assumeEvidenceValidated,
+        verifier: delivery.verifier ?? "swarm:complete-cohort",
+    };
+}
+function completeStory(args) {
+    const { storyPath, vbriefDir, projectRoot, settled, dryRun, delivery } = args;
     const folder = detectLifecycleFolder(storyPath);
     const relpath = rel(storyPath, projectRoot);
     if (folder !== null && TERMINAL_FOLDERS.includes(folder)) {
         settled.add(resolve(storyPath));
+        const plan = loadPlan(storyPath);
+        const disposition = folder === "completed" && plan !== null ? classifyStoredDeliveryDisposition(plan) : "unknown";
         return {
             kind: "story",
             path: relpath,
             action: "noop",
             ok: true,
-            detail: `already in ${folder}/`,
+            detail: folder === "completed"
+                ? `already in ${folder}/ (deliveryDisposition=${disposition})`
+                : `already in ${folder}/`,
         };
     }
     if (folder !== "active") {
@@ -147,7 +169,7 @@ function completeStory(storyPath, vbriefDir, projectRoot, settled, dryRun) {
             detail: "would complete active/ -> completed/",
         };
     }
-    const result = runTransition("complete", storyPath);
+    const result = runTransition("complete", storyPath, new Date(), transitionOptionsFor(storyPath, delivery));
     if (result.ok) {
         settled.add(resolve(join(vbriefDir, "completed", storyPath.split(/[/\\]/).pop() ?? "")));
     }
@@ -159,7 +181,8 @@ function completeStory(storyPath, vbriefDir, projectRoot, settled, dryRun) {
         detail: result.message,
     };
 }
-function completeParent(parentPath, vbriefDir, projectRoot, settled, dryRun) {
+function completeParent(args) {
+    const { parentPath, vbriefDir, projectRoot, settled, dryRun, delivery } = args;
     const folder = detectLifecycleFolder(parentPath);
     const relpath = rel(parentPath, projectRoot);
     if (folder !== null && TERMINAL_FOLDERS.includes(folder)) {
@@ -217,7 +240,7 @@ function completeParent(parentPath, vbriefDir, projectRoot, settled, dryRun) {
         }
         current = join(vbriefDir, "active", parentPath.split(/[/\\]/).pop() ?? "");
     }
-    const completeResult = runTransition("complete", current);
+    const completeResult = runTransition("complete", current, new Date(), transitionOptionsFor(current, delivery));
     if (completeResult.ok) {
         settled.add(resolve(join(vbriefDir, "completed", parentPath.split(/[/\\]/).pop() ?? "")));
     }
@@ -229,7 +252,12 @@ function completeParent(parentPath, vbriefDir, projectRoot, settled, dryRun) {
         detail: completeResult.message,
     };
 }
-export function sweepCohort(storyPaths, projectRoot, dryRun) {
+export function sweepCohort(storyPaths, projectRoot, dryRun, delivery) {
+    return sweepCohortWithArgs({ storyPaths, projectRoot, dryRun, delivery: delivery ?? null });
+}
+function sweepCohortWithArgs(args) {
+    const { storyPaths, projectRoot, dryRun } = args;
+    const delivery = args.delivery ?? null;
     let vbriefDir;
     try {
         vbriefDir = resolveLifecycleRoot(projectRoot);
@@ -275,7 +303,14 @@ export function sweepCohort(storyPaths, projectRoot, dryRun) {
                 }
             }
         }
-        result.stories.push(completeStory(storyPath, vbriefDir, projectRoot, settled, dryRun));
+        result.stories.push(completeStory({
+            storyPath,
+            vbriefDir,
+            projectRoot,
+            settled,
+            dryRun,
+            delivery,
+        }));
     }
     const finalized = new Set();
     let passes = 0;
@@ -294,7 +329,14 @@ export function sweepCohort(storyPaths, projectRoot, dryRun) {
             if (!allChildrenSettled(parentPlan, vbriefDir, settled, dryRun)) {
                 continue;
             }
-            const record = completeParent(candidate, vbriefDir, projectRoot, settled, dryRun);
+            const record = completeParent({
+                parentPath: candidate,
+                vbriefDir,
+                projectRoot,
+                settled,
+                dryRun,
+                delivery,
+            });
             result.parents.push(record);
             finalized.add(candidate);
             progressed = true;
@@ -403,7 +445,12 @@ export function completeCohort(args) {
         }
         return { exitCode: 2, stdout: "", stderr };
     }
-    const result = sweepCohort(paths, projectRoot, args.dryRun ?? false);
+    const result = sweepCohortWithArgs({
+        storyPaths: paths,
+        projectRoot,
+        dryRun: args.dryRun ?? false,
+        delivery: args.delivery ?? null,
+    });
     result.errors.push(...errors);
     if (args.emitJson) {
         return {

package/dist/swarm/finalize-cohort-cli.js

@@ -7,6 +7,7 @@ export function parseFinalizeCohortArgv(argv) {
     let repo = null;
     let projectRoot = ".";
     let baseBranch = "master";
+    let deliveryBranch = null;
     let label = null;
     let dryRun = false;
     let noCommit = false;
@@ -51,6 +52,13 @@ export function parseFinalizeCohortArgv(argv) {
             baseBranch = next;
             i += 1;
         }
+        else if (arg === "--delivery-branch" && next !== undefined) {
+            deliveryBranch = next;
+            i += 1;
+        }
+        else if (arg?.startsWith("--delivery-branch=")) {
+            deliveryBranch = arg.slice("--delivery-branch=".length);
+        }
         else if (arg === "--label" && next !== undefined) {
             label = next;
             i += 1;
@@ -77,6 +85,7 @@ export function parseFinalizeCohortArgv(argv) {
         repo,
         projectRoot,
         baseBranch,
+        deliveryBranch,
         label,
         dryRun,
         noCommit,

package/dist/swarm/finalize-cohort.d.ts

@@ -12,6 +12,8 @@ export interface FinalizeCohortResult {
     readonly commit_sha: string | null;
     readonly branch: string | null;
     readonly pr_url: string | null;
+    readonly delivery_branch: string | null;
+    readonly delivery_errors: readonly string[];
     readonly errors: readonly string[];
     readonly warnings: readonly string[];
     readonly ok: boolean;
@@ -21,7 +23,13 @@ export interface FinalizeCohortArgs {
     readonly storyTokens?: readonly string[];
     readonly repo?: string | null;
     readonly projectRoot?: string;
+    /**
+     * Swarm/PR base for the post-merge lifecycle sweep PR only.
+     * Distinct from plan.policy.deliveryBranch (#3041).
+     */
     readonly baseBranch?: string;
+    /** Override delivery branch for this run (defaults to policy/git default). */
+    readonly deliveryBranch?: string | null;
     readonly label?: string | null;
     readonly dryRun?: boolean;
     readonly noCommit?: boolean;