flanders 0.4.0 → 0.6.0

package/lib/ai/AiRunner.d.ts

@@ -13,7 +13,6 @@ export type RunArgs = Readonly<{
     model: string;
     effort: string;
     resumeSessionId?: string;
-    forkParentSessionId?: string;
     abortSignal: AbortSignal;
     callbacks: RunCallbacks;
     time: TimeContext;

package/lib/ai/AiRunner.js

@@ -18,10 +18,7 @@ async function run(args) {
         const base = { prompt, model, effort, abortSignal, onUsage: callbacks.onUsage };
         let invokeArgs;
         if (firstInvocation) {
-            if (args.forkParentSessionId) {
-                invokeArgs = { ...base, forkParentSessionId: args.forkParentSessionId };
-            }
-            else if (args.resumeSessionId) {
+            if (args.resumeSessionId) {
                 invokeArgs = { ...base, resumeSessionId: args.resumeSessionId };
             }
             else {

package/lib/ai/AiSession.d.ts

@@ -12,7 +12,6 @@ export type AiSessionOptions = Readonly<{
     model: string;
     effort: string;
     resumeSessionId?: string | null;
-    forkParentSessionId?: string | null;
     onLongWaitStart?(kind: "rate-limit", endTimeMs: number): void;
     onLongWaitEnd?(): void;
 }>;

package/lib/ai/AiSession.js

@@ -72,7 +72,6 @@ class AiSession {
                     model: this._options.model,
                     effort: this._options.effort,
                     ...(this._options.resumeSessionId != null ? { resumeSessionId: this._options.resumeSessionId } : null),
-                    ...(this._options.forkParentSessionId != null ? { forkParentSessionId: this._options.forkParentSessionId } : null),
                     abortSignal: controller.signal,
                     callbacks: {
                         onOutput,

package/lib/ai/ClaudeAdapter.js

@@ -167,16 +167,13 @@ class ClaudeAdapterIterator {
         if (this._args.resumeSessionId) {
             argv.push("--resume", this._args.resumeSessionId);
         }
-        else if (this._args.forkParentSessionId) {
-            argv.push("--resume", this._args.forkParentSessionId, "--fork-session");
-        }
         if (this._args.model) {
             argv.push("--model", this._args.model);
         }
         if (this._args.effort) {
             argv.push("--effort", this._args.effort);
         }
-        argv.push("--input-format", "stream-json", "--output-format", "stream-json", "--include-partial-messages", "--verbose", "--print");
+        argv.push("--input-format", "stream-json", "--output-format", "stream-json", "--include-partial-messages", "--verbose", "--print", "--dangerously-skip-permissions");
         return argv;
     }
     _handleLine(line) {

package/lib/ai/CodexAdapter.js

@@ -98,15 +98,14 @@ class CodexAdapterIterator {
         this._sawTurnCompleted = false;
         this._receivedAnyEvent = false;
         this._fallbackAttempted = false;
-        this._usedResumeOrFork = false;
+        this._usedResume = false;
         this._start(false);
     }
     _start(useExecFallback) {
         var _a, _b, _c;
         const isResume = !useExecFallback && !!this._args.resumeSessionId;
-        const isFork = !useExecFallback && !!this._args.forkParentSessionId;
-        this._usedResumeOrFork = isResume || isFork;
-        const argv = this._buildArgv(isResume, isFork);
+        this._usedResume = isResume;
+        const argv = this._buildArgv(isResume);
         const spawnOptions = { stdio: "pipe" };
         const proc = this._contexts.script.spawn("codex", argv, spawnOptions);
         this._proc = proc;
@@ -149,18 +148,18 @@ class CodexAdapterIterator {
                 exitResolve === null || exitResolve === void 0 ? void 0 : exitResolve();
                 return;
             }
-            if (this._usedResumeOrFork && !this._receivedAnyEvent && !this._fallbackAttempted) {
+            if (this._usedResume && !this._receivedAnyEvent && !this._fallbackAttempted) {
                 this._fallbackAttempted = true;
                 this._queue.push({
                     type: "output",
                     title: "Continuity lost",
                     subtitle: "",
-                    details: "codex resume/fork unavailable in installed CLI"
+                    details: "codex resume unavailable in installed CLI"
                 });
                 this._cleanup();
                 this._sawTurnCompleted = false;
                 this._receivedAnyEvent = false;
-                this._usedResumeOrFork = false;
+                this._usedResume = false;
                 exitResolve === null || exitResolve === void 0 ? void 0 : exitResolve();
                 this._start(true);
                 this._wake();
@@ -201,14 +200,11 @@ class CodexAdapterIterator {
             this._args.abortSignal.addEventListener("abort", this._abortListener, { once: true });
         }
     }
-    _buildArgv(isResume, isFork) {
+    _buildArgv(isResume) {
         const argv = [];
         if (isResume) {
             argv.push("resume", this._args.resumeSessionId);
         }
-        else if (isFork) {
-            argv.push("fork", this._args.forkParentSessionId);
-        }
         else {
             argv.push("exec");
         }

package/lib/ai/ToolAdapter.d.ts

@@ -34,17 +34,11 @@ type ToolAdapterInvokeArgsBase = Readonly<{
 }>;
 export type ToolAdapterInvokeArgsFresh = ToolAdapterInvokeArgsBase & Readonly<{
     resumeSessionId?: undefined;
-    forkParentSessionId?: undefined;
 }>;
 export type ToolAdapterInvokeArgsResume = ToolAdapterInvokeArgsBase & Readonly<{
     resumeSessionId: string;
-    forkParentSessionId?: undefined;
 }>;
-export type ToolAdapterInvokeArgsFork = ToolAdapterInvokeArgsBase & Readonly<{
-    resumeSessionId?: undefined;
-    forkParentSessionId: string;
-}>;
-export type ToolAdapterInvokeArgs = ToolAdapterInvokeArgsFresh | ToolAdapterInvokeArgsResume | ToolAdapterInvokeArgsFork;
+export type ToolAdapterInvokeArgs = ToolAdapterInvokeArgsFresh | ToolAdapterInvokeArgsResume;
 export interface ToolAdapter {
     invoke(args: ToolAdapterInvokeArgs): AsyncIterable<ToolEvent>;
 }

package/lib/commands/Implement.d.ts

@@ -27,7 +27,6 @@ export declare class Implement {
     private _block;
     private _buffered;
     private _currentWorkerSessionId;
-    private _currentPrepSessionId;
     private _activeSession;
     private _activeScript;
     private _activeReviewerSessions;
@@ -42,7 +41,6 @@ export declare class Implement {
     private _taskRateLimitMs;
     private _taskRateLimitStartedAt;
     private _taskTokens;
-    private _restingFooterKind;
     private _runPromise;
     get config(): FlandersConfig | null;
     constructor(rawArgs: readonly string[], _options: ImplementOptions, _contexts: ImplementContexts);
@@ -54,11 +52,8 @@ export declare class Implement {
     private _activeSeconds;
     private _persistMetrics;
     private _updateMetrics;
-    private _reviewerMatchesWorker;
-    private _prepActive;
     private _gitOutputContext;
     private _runTask;
-    private _prepStage;
     private _workerStage;
     private _appendLinkedContent;
     private _buildStage;

package/lib/commands/Implement.js

@@ -61,7 +61,6 @@ class Implement {
         this._workspace = null;
         this._block = null;
         this._currentWorkerSessionId = null;
-        this._currentPrepSessionId = null;
         this._activeSession = null;
         this._activeScript = null;
         this._activeReviewerSessions = new Set();
@@ -76,7 +75,6 @@ class Implement {
         this._taskRateLimitMs = 0;
         this._taskRateLimitStartedAt = null;
         this._taskTokens = { it: 0, ot: 0 };
-        this._restingFooterKind = "working";
         this._runPromise = this._run(rawArgs);
         this._runPromise.catch(() => { });
     }
@@ -185,7 +183,7 @@ class Implement {
                 const refreshed = plan.parse();
                 const completedSoFar = refreshed.tasks.filter(t => t.done).length;
                 const indexLabel = `${completedSoFar + 1}/${totalTasks}`;
-                const taskOk = await this._runTask(plan, open, wsPaths, indexLabel, completedSoFar);
+                const taskOk = await this._runTask(plan, open, wsPaths, indexLabel);
                 if (this._disposed) {
                     this._finalizeBlock("Interrupted");
                     return 1;
@@ -244,12 +242,12 @@ class Implement {
             .split("<RULE_LIST>").join(this._formatPathList(this._ruleList));
         await this._runAi(this._config.worker.tool, this._config.worker.model, this._config.worker.effort, prompt);
     }
-    _setActivity(activity, iteration) {
+    _setActivity(activity) {
         if (!this._currentTask)
             return;
         this._block.setHeader({
             indexLabel: this._currentIndexLabel,
-            iteration: iteration === undefined ? this._currentIteration : iteration,
+            iteration: this._currentIteration,
             activity,
             taskNumber: this._currentTask.taskNumber || undefined,
             title: this._currentTask.title
@@ -275,13 +273,6 @@ class Implement {
             plan: { tokens: planTotals.it + planTotals.ot, seconds: planTotals.t }
         });
     }
-    _reviewerMatchesWorker(reviewer) {
-        const w = this._config.worker;
-        return reviewer.tool === w.tool && reviewer.model === w.model && reviewer.effort === w.effort;
-    }
-    _prepActive() {
-        return this._config.reviewers.some(r => this._reviewerMatchesWorker(r));
-    }
     _gitOutputContext() {
         return {
             write: text => this._buffered.write(text),
@@ -291,31 +282,15 @@ class Implement {
             onResize: listener => this._contexts.output.onResize(listener)
         };
     }
-    async _runTask(plan, task, ws, indexLabel, taskIndex) {
+    async _runTask(plan, task, ws, indexLabel) {
         this._currentTask = task;
         this._currentIndexLabel = indexLabel;
         this._currentWorkerSessionId = null;
-        this._currentPrepSessionId = null;
         this._taskStartedAt = this._contexts.time.now();
         this._taskRateLimitMs = 0;
         this._taskRateLimitStartedAt = null;
         this._taskTokens = { it: 0, ot: 0 };
         this._updateMetrics(plan);
-        const prepActive = this._prepActive();
-        if (prepActive) {
-            this._setActivity("preparing", null);
-            this._restingFooterKind = "preparing";
-            this._block.setFooter({ kind: "preparing" });
-            const prepOk = await this._prepStage(plan, task, ws, taskIndex);
-            if (this._disposed) {
-                return false;
-            }
-            if (!prepOk) {
-                return false;
-            }
-            this._restingFooterKind = "working";
-            this._block.setFooter({ kind: "working" });
-        }
         let iteration = 0;
         for (;;) {
             iteration++;
@@ -329,7 +304,7 @@ class Implement {
                 return false;
             }
             this._setActivity("implementing");
-            const workerOk = await this._workerStage(plan, task, ws, iteration, prepActive);
+            const workerOk = await this._workerStage(plan, task, ws, iteration);
             if (this._disposed) {
                 return false;
             }
@@ -358,7 +333,7 @@ class Implement {
                 continue;
             }
             this._setActivity("reviewing");
-            const reviewOk = await this._reviewerStage(plan, task, ws, iteration, prepActive);
+            const reviewOk = await this._reviewerStage(plan, task, ws, iteration);
             if (this._disposed) {
                 return false;
             }
@@ -387,52 +362,25 @@ class Implement {
             return true;
         }
     }
-    async _prepStage(plan, task, ws, taskIndex) {
-        const prompt = prompts_1.prompts.prep
-            .split("<PLAN_PATH>").join(plan.path)
-            .split("<TASK_LINE>").join(String(task.line))
-            .split("<TASK_TITLE>").join(task.title)
-            .split("<CONTRACT_LIST>").join(this._formatPathList(this._contractList))
-            .split("<RULE_LIST>").join(this._formatPathList(this._ruleList))
-            .split("<BEHAVIOR_RULE_LIST>").join(this._formatPathList(this._behaviorRuleList));
-        try {
-            const { result, capturedOutput } = await this._runAi(this._config.worker.tool, this._config.worker.model, this._config.worker.effort, prompt);
-            this._taskTokens.it += result.inputTokens;
-            this._taskTokens.ot += result.outputTokens;
-            await this._persistMetrics(plan, task.line);
-            this._updateMetrics(plan);
-            await this._writeLog(ws.prepLog(taskIndex), capturedOutput);
-            if (result.sessionId === null) {
-                this._workspace.preserveOnDispose();
-                await this._writeErrorLog(ws, `prep returned no session id for task at line ${task.line} ("${task.title}")`);
-                this._buffered.writeError(`Hard stop: prep for task at line ${task.line} ("${task.title}") returned no session id. Inspect logs at ${ws.root}.\n`);
-                return false;
-            }
-            this._currentPrepSessionId = result.sessionId;
-            return true;
+    async _workerStage(plan, task, ws, iteration) {
+        let taskText;
+        if (iteration === 1) {
+            taskText = plan.fullTaskText(task);
         }
-        catch (e) {
-            await this._persistMetrics(plan, task.line);
-            this._updateMetrics(plan);
-            this._workspace.preserveOnDispose();
-            await this._writeErrorLog(ws, `prep stage failed: ${this._stringifyError(e)}`);
-            this._buffered.writeError(`Hard stop: prep for task at line ${task.line} ("${task.title}") failed. Inspect logs at ${ws.root}.\n`);
-            return false;
+        else if (this._currentWorkerSessionId !== null) {
+            taskText = "(The full task text and the contracts and rules it references were provided when this session began and remain available to you through session continuity; they are not repeated here.)";
+        }
+        else {
+            taskText = `(Your previous session for this task could not be resumed, so this is a fresh invocation. You are continuing work on the task at line ${task.line} of the plan file, titled "${task.title}". Re-read that task and the contracts and rules it references directly from the files on disk — they are not re-injected here — and address the previous-iteration briefing below.)`;
         }
-    }
-    async _workerStage(plan, task, ws, iteration, prepActive) {
         let prompt = prompts_1.prompts.worker
             .split("<PLAN_PATH>").join(plan.path)
-            .split("<TASK_LINE>").join(String(task.line))
-            .split("<TASK_TITLE>").join(task.title)
+            .split("<TASK_TEXT>").join(taskText)
             .split("<BUILD_SCRIPT_PATH>").join(ws.buildScript)
             .split("<TEST_SCRIPT_PATH>").join(ws.testScript)
             .split("<CONTRACT_LIST>").join(this._formatPathList(this._contractList))
             .split("<RULE_LIST>").join(this._formatPathList(this._ruleList))
             .split("<BEHAVIOR_RULE_LIST>").join(this._formatPathList(this._behaviorRuleList));
-        if (iteration === 1 && !prepActive) {
-            prompt = await this._appendLinkedContent(plan, task, prompt);
-        }
         if (iteration > 1) {
             const briefing = prompts_1.prompts.previousIterationBriefing
                 .split("<ITERATION>").join(String(iteration))
@@ -440,10 +388,11 @@ class Implement {
             prompt = `${prompt}\n\n${briefing}`;
         }
         try {
+            if (iteration === 1) {
+                prompt = await this._appendLinkedContent(plan, task, prompt);
+            }
             const { result, capturedOutput } = iteration === 1
-                ? prepActive
-                    ? await this._runAi(this._config.worker.tool, this._config.worker.model, this._config.worker.effort, prompt, null, this._currentPrepSessionId)
-                    : await this._runAi(this._config.worker.tool, this._config.worker.model, this._config.worker.effort, prompt)
+                ? await this._runAi(this._config.worker.tool, this._config.worker.model, this._config.worker.effort, prompt)
                 : await this._runAi(this._config.worker.tool, this._config.worker.model, this._config.worker.effort, prompt, this._currentWorkerSessionId);
             if (result.sessionId !== null) {
                 this._currentWorkerSessionId = result.sessionId;
@@ -471,15 +420,10 @@ class Implement {
         const sections = [];
         for (const relPath of allPaths) {
             const absPath = (0, fsUtils_1.joinPath)(this._options.projectRoot, relPath);
-            try {
-                const content = await this._contexts.fs.readFile(absPath);
-                sections.push(`## ${relPath}\n\n${content}`);
-            }
-            catch {
-                sections.push(`## ${relPath}\n\n(file not found)`);
-            }
+            const content = await this._contexts.fs.readFile(absPath);
+            sections.push(`## ${relPath}\n\n${content}`);
         }
-        return `${prompt}\n\n## Linked reference content\n\n${sections.join("\n\n")}`;
+        return `${prompt}\n\n## Linked reference content\n\nThe full content of every contract and rule this task references is included below, so you do not need to open these files for this iteration:\n\n${sections.join("\n\n")}`;
     }
     async _buildStage(plan, taskLine, ws, iteration) {
         if (!(await (0, fsUtils_1.isNonEmptyFile)(this._contexts.fs, ws.buildScript))) {
@@ -557,7 +501,7 @@ class Implement {
             }
         }
     }
-    async _reviewerStage(plan, task, ws, iteration, prepActive) {
+    async _reviewerStage(plan, task, ws, iteration) {
         const reviewers = this._config.reviewers;
         this._reviewerStates = reviewers.map(r => ({ tool: r.tool, model: r.model, effort: r.effort, state: "running" }));
         this._reviewerLogicalStatuses = reviewers.map(() => "running");
@@ -569,7 +513,7 @@ class Implement {
         await this._workspace.clearErrorLog();
         let failureCaught = null;
         const outcomes = reviewers.map(() => "cancelled");
-        const launches = reviewers.map((reviewer, idx) => this._runOneReviewerToVerdict(plan, task, ws, iteration, prepActive, reviewer, idx)
+        const launches = reviewers.map((reviewer, idx) => this._runOneReviewerToVerdict(plan, task, ws, iteration, reviewer, idx)
             .then(outcome => { outcomes[idx] = outcome; })
             .catch(e => {
             if (failureCaught === null) {
@@ -599,21 +543,16 @@ class Implement {
         await this._workspace.writeErrorLog(aggregate);
         return false;
     }
-    async _runOneReviewerToVerdict(plan, task, ws, iteration, prepActive, reviewer, idx) {
+    async _runOneReviewerToVerdict(plan, task, ws, iteration, reviewer, idx) {
         const reviewerNum = idx + 1;
-        const matchesWorker = this._reviewerMatchesWorker(reviewer);
-        const useBranchA = prepActive && matchesWorker;
         let prompt = prompts_1.prompts.reviewer
             .split("<PLAN_PATH>").join(plan.path)
-            .split("<TASK_LINE>").join(String(task.line))
-            .split("<TASK_TITLE>").join(task.title)
+            .split("<TASK_TEXT>").join(plan.fullTaskText(task))
             .split("<CONTRACT_LIST>").join(this._formatPathList(this._contractList))
             .split("<RULE_LIST>").join(this._formatPathList(this._ruleList))
             .split("<BEHAVIOR_RULE_LIST>").join(this._formatPathList(this._behaviorRuleList))
             .split("<ERROR_LOG_PATH>").join(ws.reviewerErrorLog(reviewerNum));
-        if (!useBranchA) {
-            prompt = await this._appendLinkedContent(plan, task, prompt);
-        }
+        prompt = await this._appendLinkedContent(plan, task, prompt);
         const controller = new AbortController();
         this._reviewerAbortControllers.set(idx, controller);
         try {
@@ -656,9 +595,7 @@ class Implement {
                 };
                 let runResult;
                 try {
-                    runResult = useBranchA
-                        ? await this._runAiWith(reviewer.tool, reviewer.model, reviewer.effort, prompt, null, this._currentPrepSessionId, callbacks)
-                        : await this._runAiWith(reviewer.tool, reviewer.model, reviewer.effort, prompt, null, null, callbacks);
+                    runResult = await this._runAiWith(reviewer.tool, reviewer.model, reviewer.effort, prompt, null, callbacks);
                 }
                 catch (e) {
                     if (this._cancelledReviewers.has(idx)) {
@@ -726,7 +663,7 @@ class Implement {
                 }
                 if (this._disposed)
                     return;
-                this._block.setFooter({ kind: this._restingFooterKind });
+                this._block.setFooter({ kind: "working" });
             },
             register: (session) => {
                 this._activeSession = { session };
@@ -739,10 +676,10 @@ class Implement {
             }
         };
     }
-    _runAi(tool, model, effort, prompt, initialSessionId, forkFromSessionId) {
-        return this._runAiWith(tool, model, effort, prompt, initialSessionId !== null && initialSessionId !== void 0 ? initialSessionId : null, forkFromSessionId !== null && forkFromSessionId !== void 0 ? forkFromSessionId : null, this._defaultRunAiCallbacks());
+    _runAi(tool, model, effort, prompt, initialSessionId) {
+        return this._runAiWith(tool, model, effort, prompt, initialSessionId !== null && initialSessionId !== void 0 ? initialSessionId : null, this._defaultRunAiCallbacks());
     }
-    async _runAiWith(tool, model, effort, prompt, initialSessionId, forkFromSessionId, callbacks) {
+    async _runAiWith(tool, model, effort, prompt, initialSessionId, callbacks) {
         if (this._disposed) {
             throw new Error("Implement disposed");
         }
@@ -767,7 +704,6 @@ class Implement {
             model,
             effort,
             ...(initialSessionId != null ? { resumeSessionId: initialSessionId } : null),
-            ...(forkFromSessionId != null ? { forkParentSessionId: forkFromSessionId } : null),
             onLongWaitStart: callbacks.onLongWaitStart,
             onLongWaitEnd: callbacks.onLongWaitEnd
         }, {

package/lib/plan/PlanFile.d.ts

@@ -27,6 +27,7 @@ export type PlanParseResult = Readonly<{
 }>;
 export declare const TASK_LINE: RegExp;
 export declare function parsePlan(content: string): PlanParseResult;
+export declare function extractFullTaskText(content: string, taskLineNumber: number): string;
 export declare function parseLinkedPaths(content: string, taskLineNumber: number): TaskLinkedPaths;
 export declare class PlanFile {
     readonly path: string;
@@ -40,6 +41,7 @@ export declare class PlanFile {
     markDone(lineNumber: number, metrics: TaskMetrics): Promise<void>;
     markOpen(lineNumber: number, metrics: TaskMetrics): Promise<void>;
     linkedPaths(task: PlanTask): TaskLinkedPaths;
+    fullTaskText(task: PlanTask): string;
     planTotals(): TaskMetrics;
     private _rewriteTaskLine;
 }

package/lib/plan/PlanFile.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlanFile = exports.TASK_LINE = void 0;
 exports.parsePlan = parsePlan;
+exports.extractFullTaskText = extractFullTaskText;
 exports.parseLinkedPaths = parseLinkedPaths;
 exports.TASK_LINE = /^(\s*[-*+]\s+)\[([ xX])\](\{[^}]*\})(\s.*)?$/;
 const MALFORMED_TASK_LINE = /^\s*[-*+]\s+\[[^\]]*\]\{/;
@@ -88,14 +89,12 @@ function parsePlan(content) {
         size: content.length
     };
 }
-const BACKTICK_PATH = /`([^`]+)`/g;
-function extractPathsFromLine(text) {
-    const paths = [];
-    let m;
-    while ((m = BACKTICK_PATH.exec(text)) !== null) {
-        paths.push(m[1]);
-    }
-    return paths;
+const MARKDOWN_LINK = /\[[^\]]*\]\(([^)]+)\)/g;
+const CONTRACTS_SEGMENT = ".spec/contracts/";
+const RULES_SEGMENT = ".spec/rules/";
+function detectNewline(content) {
+    const newlineMatch = /\r\n|\n/.exec(content);
+    return newlineMatch ? newlineMatch[0] : "\n";
 }
 function taskBodyLines(content, taskLineNumber) {
     const lines = content.split(/\r?\n/);
@@ -108,17 +107,30 @@ function taskBodyLines(content, taskLineNumber) {
     }
     return body;
 }
+function extractFullTaskText(content, taskLineNumber) {
+    const lines = content.split(/\r?\n/);
+    const taskLine = lines[taskLineNumber - 1];
+    const body = taskBodyLines(content, taskLineNumber);
+    return [taskLine, ...body].join(detectNewline(content));
+}
 function parseLinkedPaths(content, taskLineNumber) {
     const body = taskBodyLines(content, taskLineNumber);
-    let contracts = [];
-    let rules = [];
+    const contracts = [];
+    const rules = [];
     for (const line of body) {
-        const trimmed = line.trimStart();
-        if (trimmed.startsWith("Linked contracts:")) {
-            contracts = extractPathsFromLine(trimmed.slice("Linked contracts:".length));
-        }
-        else if (trimmed.startsWith("Linked rules:")) {
-            rules = extractPathsFromLine(trimmed.slice("Linked rules:".length));
+        let m;
+        while ((m = MARKDOWN_LINK.exec(line)) !== null) {
+            const path = m[1].split("#")[0].replace(/^\//, "");
+            if (path.includes(CONTRACTS_SEGMENT)) {
+                if (!contracts.includes(path)) {
+                    contracts.push(path);
+                }
+            }
+            else if (path.includes(RULES_SEGMENT)) {
+                if (!rules.includes(path)) {
+                    rules.push(path);
+                }
+            }
         }
     }
     return { contracts, rules };
@@ -156,6 +168,9 @@ class PlanFile {
     linkedPaths(task) {
         return parseLinkedPaths(this._content, task.line);
     }
+    fullTaskText(task) {
+        return extractFullTaskText(this._content, task.line);
+    }
     planTotals() {
         const { tasks } = parsePlan(this._content);
         let it = 0, ot = 0, t = 0;
@@ -168,8 +183,7 @@ class PlanFile {
     }
     async _rewriteTaskLine(lineNumber, metrics, flip) {
         validateMetricsInput(metrics);
-        const newlineMatch = /\r\n|\n/.exec(this._content);
-        const newline = newlineMatch ? newlineMatch[0] : "\n";
+        const newline = detectNewline(this._content);
         const lines = this._content.split(/\r?\n/);
         const idx = lineNumber - 1;
         const raw = lines[idx];

package/lib/prompts/prompts.d.ts

@@ -1,7 +1,6 @@
 export declare const enum Placeholders {
     PLAN_PATH = "<PLAN_PATH>",
-    TASK_LINE = "<TASK_LINE>",
-    TASK_TITLE = "<TASK_TITLE>",
+    TASK_TEXT = "<TASK_TEXT>",
     BUILD_SCRIPT_PATH = "<BUILD_SCRIPT_PATH>",
     TEST_SCRIPT_PATH = "<TEST_SCRIPT_PATH>",
     ERROR_LOG_PATH = "<ERROR_LOG_PATH>",
@@ -43,6 +42,5 @@ export declare const prompts: {
     detectBuildAndTest: string;
     worker: string;
     reviewer: string;
-    prep: string;
     previousIterationBriefing: string;
 };

package/lib/prompts/prompts.js

@@ -160,10 +160,11 @@ Spec-folder write boundary: you must not create, modify, delete, or rename any f
 ${foregroundBoundary}`,
     worker: `You are the worker agent for the Flanders implement iteration loop.
 
-Plan file path: ${"<PLAN_PATH>"}
+The plan file is at ${"<PLAN_PATH>"}; you may open it for broader context.
 
-The current task is on line ${"<TASK_LINE>"} of that plan file. Its title, verbatim, is:
-${"<TASK_TITLE>"}
+## Your task
+
+${"<TASK_TEXT>"}
 
 ## Adversarial review awaits
 
@@ -178,7 +179,7 @@ Your output will be inspected by an adversarial reviewer immediately after you f
 Condition 4 causes most rejections in practice. Rules whose scope matches your changes (testing rules when you touch tests, disposable rules when you touch async resources, UI rules when you change terminal output, etc.) are mandatory whether the task links them or not. Treat the global contract and rule lists below as part of your specification, not as optional reading. The reviewer will also enumerate every occurrence of a pattern violation, not just the first one, so partial compliance within a file is itself a FAIL.
 
 Procedure:
-1. Open the plan file and find that line. Read the full task description and its acceptance criteria. You are not required to re-read the linked contracts and rules — on iteration 1 their content is already in context through the prep fork, and on later iterations it is preserved by your own session continuity. You may consult them at your discretion, but you must respect their obligations exactly.
+1. Read the task shown above and respect the obligations of every contract and rule it references exactly. You may consult those files, or the plan file for broader context, at your discretion.
 2. Implement the task. Update or extend tests so the new behavior is covered.
 3. If your implementation changes how the project builds or how its tests run, also update the build and test scripts at:
    - Build script: ${"<BUILD_SCRIPT_PATH>"}
@@ -232,12 +233,13 @@ Each path below is a behavior rule's namespace. A behavior rule governs how the
 ${"<BEHAVIOR_RULE_LIST>"}`,
     reviewer: `You are the adversarial reviewer agent for the Flanders implement iteration loop.
 
-Plan file path: ${"<PLAN_PATH>"}
+The plan file is at ${"<PLAN_PATH>"}; you may open it for broader context, but you do not need to in order to find the task — the full task is provided in this prompt.
+
+## The task under review
 
-The current task is on line ${"<TASK_LINE>"} of that plan file. Its title, verbatim, is:
-${"<TASK_TITLE>"}
+${"<TASK_TEXT>"}
 
-Read the task's full description, its acceptance criteria, every contract referenced by the task AND every rule referenced by the task. Inspect the working-tree changes that the worker just produced.
+The task's full description, its acceptance criteria, and the full content of every contract and rule it references are provided to you directly — the referenced contracts and rules are injected inline at the end of this prompt (under "Linked reference content"). Inspect the working-tree changes that the worker just produced.
 
 ## Determining the worker's change set
 
@@ -268,58 +270,6 @@ Git boundary: you are an inspection-only agent. You must not execute any git com
 Spec-folder write boundary: you must not create, modify, delete, or rename any file inside any \`.spec/contracts\` folder, any \`.spec/rules\` folder, or the \`plans/\` folder. These folders are governed by dedicated skills and the implement command's bounded checkpoint updates; no other agent may write to them. See shared/spec-folder-write-authority.md for the full obligation.
 
 ${foregroundBoundary}`,
-    prep: `You are the prep agent for the Flanders implement iteration loop.
-
-Plan file path: ${"<PLAN_PATH>"}
-
-The current task is on line ${"<TASK_LINE>"} of that plan file. Its title, verbatim, is:
-${"<TASK_TITLE>"}
-
-## Your job
-
-Read the task and its reference material so the session is ready to be forked by the worker and reviewer agents. You do not implement anything — you are a read-only context-loading agent.
-
-Procedure:
-1. Open the plan file and find the task at the line indicated above. Read its full description, acceptance criteria, and every contract and rule file the task references.
-2. From the global lists below, read the full content of every additional contract or rule you judge relevant to the task, even if the task does not explicitly reference it. Err on the side of loading material that might be needed rather than skipping it.
-
-## Read-only obligation
-
-You must not implement, modify, or write anything in the project. Do not use Edit, Write, or any Bash command that mutates project state. Your only job is to read and load context.
-
-## Spec-folder write boundary
-
-You must not write to any \`.spec/contracts\` folder, any \`.spec/rules\` folder, or the \`plans/\` folder. These folders are governed by dedicated skills and the implement command's bounded checkpoint updates; no other agent may create, modify, delete, or rename files in them. See shared/spec-folder-write-authority.md for the full obligation.
-
-## Git boundary
-
-You must not execute any git command that modifies repository state — no \`git add\`, \`git commit\`, \`git stash\`, \`git reset\`, \`git restore\`, \`git checkout -b\`, \`git branch\`, \`git tag\`, \`git rebase\`, \`git merge\`, \`git cherry-pick\`, no edits under \`.git/\`, and no remote git operations (\`fetch\`, \`pull\`, \`push\`). Read-only git commands (\`git status\`, \`git diff\`, \`git log\`, \`git show\`, \`git blame\`, \`git ls-files\`) are allowed when you need to inspect the repo. The full obligation lives in rules/ai/agents/no-git-writes.md.
-
-${foregroundBoundary}
-
-## Available contracts
-
-Each path below is the contract's namespace. Scan this list and open every contract whose public surface intersects the work in this task.
-
-${"<CONTRACT_LIST>"}
-
-## Available rules
-
-Each path below is the rule's namespace. Scan this list and open every rule whose scope matches the work in this task.
-
-${"<RULE_LIST>"}
-
-## Available behavior rules
-
-Each path below is a behavior rule's namespace. A behavior rule governs how the files and changes Flanders authors are named, placed, and organized within the part of the project tree that the rule's \`.spec/flanders\` folder scopes; every behavior rule whose \`.spec/flanders\` scope encloses the files this task's work touches must be honored. Read all of those in-scope behavior rules now, so the worker and reviewer forked from this session honor them. Like the global contract and rule lists above, in-scope behavior rules are mandatory whether or not the task links them.
-
-${"<BEHAVIOR_RULE_LIST>"}
-
-## Ending discipline
-
-When you have finished reading all relevant material, end your reply with the word READY on its own line and no pending tool calls. The session must be in a forkable state.
-
-READY`,
     previousIterationBriefing: `This is iteration ${"<ITERATION>"} for this task. The previous iteration produced a problem to review before retrying. Read the full context written into the error log file at:
 
 ${"<ERROR_LOG_PATH>"}

package/lib/ui/BottomBlock.d.ts

@@ -6,7 +6,7 @@ export type BottomBlockIO = {
     columns(): number;
     onResize(listener: () => void): () => void;
 };
-export type Activity = "preparing" | "implementing" | "reviewing" | "building" | "testing";
+export type Activity = "implementing" | "reviewing" | "building" | "testing";
 export type HeaderFields = {
     indexLabel?: string | null;
     iteration?: number | null;
@@ -29,8 +29,6 @@ export type FooterState = {
     kind: "blank";
 } | {
     kind: "working";
-} | {
-    kind: "preparing";
 } | {
     kind: "waiting";
     waitKind: WaitKind;

package/lib/ui/BottomBlock.js

@@ -66,7 +66,7 @@ class BottomBlock {
             return;
         this._cancelTimers();
         this._footer = state;
-        if (state.kind === "working" || state.kind === "preparing") {
+        if (state.kind === "working") {
             this._animFrame = 0;
         }
         if (this._mounted) {
@@ -125,7 +125,7 @@ class BottomBlock {
         }
     }
     _startFooterTimer() {
-        if (this._footer.kind === "working" || this._footer.kind === "preparing") {
+        if (this._footer.kind === "working") {
             this._scheduleAnimTick();
         }
         else if (this._footer.kind === "waiting") {
@@ -135,7 +135,7 @@ class BottomBlock {
     _scheduleAnimTick() {
         this._animTimer = this._time.setTimeout(() => {
             this._animTimer = null;
-            if (this._disposed || this._finalized || (this._footer.kind !== "working" && this._footer.kind !== "preparing"))
+            if (this._disposed || this._finalized || this._footer.kind !== "working")
                 return;
             this._animFrame = (this._animFrame + 1) % FRAMES.length;
             this._clearBlock();
@@ -189,8 +189,6 @@ class BottomBlock {
                 return "";
             case "working":
                 return (0, formatters_1.formatWorkingFooter)(FRAMES[this._animFrame], cols);
-            case "preparing":
-                return (0, formatters_1.formatPreparingFooter)(FRAMES[this._animFrame], cols);
             case "waiting": {
                 const remaining = Math.max(0, this._footer.endTime - this._time.now());
                 const dateStr = (0, formatters_1.formatDateTime)(new Date(this._footer.endTime));

package/lib/ui/formatters.d.ts

@@ -39,5 +39,4 @@ export type ReviewerEntry = {
 };
 export declare function formatReviewingFooter(reviewers: readonly ReviewerEntry[], cols: number): string;
 export declare function formatWorkingFooter(frame: string, cols: number): string;
-export declare function formatPreparingFooter(frame: string, cols: number): string;
 export declare function formatWaitingFooter(heading: string, dateTime: string, countdown: string, cols: number): string;

package/lib/ui/formatters.js

@@ -17,7 +17,6 @@ exports.formatSnapshotMetrics = formatSnapshotMetrics;
 exports.formatSnapshotBlock = formatSnapshotBlock;
 exports.formatReviewingFooter = formatReviewingFooter;
 exports.formatWorkingFooter = formatWorkingFooter;
-exports.formatPreparingFooter = formatPreparingFooter;
 exports.formatWaitingFooter = formatWaitingFooter;
 exports.CYAN = "\x1b[36m";
 exports.YELLOW = "\x1b[33m";
@@ -114,7 +113,7 @@ function formatActiveTime(seconds) {
     const m = Math.floor((s % 3600) / 60);
     return `${h}h${pad2(m)}m${pad2(s % 60)}s`;
 }
-const LIVE_ACTIVITIES = new Set(["preparing", "implementing", "reviewing", "building", "testing"]);
+const LIVE_ACTIVITIES = new Set(["implementing", "reviewing", "building", "testing"]);
 function formatHeaderLine(indexLabel, iteration, activity, taskNumber, title, cols) {
     const segments = [];
     if (indexLabel != null) {
@@ -276,9 +275,6 @@ function fitOrangeFooterLine(text, cols) {
 function formatWorkingFooter(frame, cols) {
     return fitOrangeFooterLine(`${frame} Working`, cols);
 }
-function formatPreparingFooter(frame, cols) {
-    return fitOrangeFooterLine(`${frame} Preparing`, cols);
-}
 function formatWaitingFooter(heading, dateTime, countdown, cols) {
     return fitOrangeFooterLine(`${heading} — ${dateTime} — ${countdown}`, cols);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "flanders",
-  "version": "0.4.0",
-  "description": "Stubborn and smart plan implementation looper using AI",
+  "version": "0.6.0",
+  "description": "Flanders never breaks a rule",
   "main": "lib/",
   "types": "lib/types",
   "files": [