@emiliosp/pi-maestro 0.5.2 → 0.6.1

package/src/artifacts/verifier-handoff/writeVerifierHandoff.ts

@@ -4,28 +4,28 @@
  */
 
 import { assertVerifierHandoff } from '#artifacts/verifier-handoff/assertVerifierHandoff.ts';
-import { writeJsonAtomically } from '#utils/write-json-atomically.ts';
+import { writeJson } from '#utils/write-json.ts';
 
 type WriteVerifierHandoffInput = {
   path: string;
   handoff: unknown;
   specId: string;
-  revision: number;
 };
 
 export const writeVerifierHandoff = async ({
   path,
   handoff: draftHandoff,
   specId,
-  revision,
 }: WriteVerifierHandoffInput): Promise<void> => {
-  const input = { handoff: draftHandoff, specId, revision };
+  const input = { handoff: draftHandoff, specId };
   assertVerifierHandoff(input);
   const { handoff } = input;
 
-  if (handoff.findings.some((finding) => finding.rejection !== null)) {
-    throw new Error('New verifier handoff findings must have no rejection.');
+  if (handoff.findings.some((finding) => finding.decision !== null)) {
+    throw new Error(
+      'New verifier handoff findings must have no owner decision.',
+    );
   }
 
-  await writeJsonAtomically({ path, data: handoff });
+  await writeJson({ path, data: handoff });
 };

package/src/config/loadConfiguration.ts

@@ -1,6 +1,6 @@
 /**
- * Objective: Load and validate repository configuration.
- * Used: When Maestro initializes for a repository.
+ * Objective: Load and validate project configuration.
+ * Used: When Maestro initializes for a project.
  */
 
 import { readFile, realpath } from 'node:fs/promises';
@@ -47,52 +47,52 @@ function assertSafeDirectoryInput({
   }
 
   if (isAbsolute(value)) {
-    throw new Error(`${name} must be relative to the Git root.`);
+    throw new Error(`${name} must be relative to the project root.`);
   }
 }
 
 type ResolveSafeDirectoryInput = {
-  repositoryRoot: string;
+  projectRoot: string;
   directory: string;
   name: string;
 };
 
 const resolveSafeDirectory = ({
-  repositoryRoot,
+  projectRoot,
   directory,
   name,
 }: ResolveSafeDirectoryInput): string => {
   assertSafeDirectoryInput({ value: directory, name });
 
-  const requestedDirectory = resolve(repositoryRoot, directory);
+  const requestedDirectory = resolve(projectRoot, directory);
 
-  if (requestedDirectory === repositoryRoot) {
-    throw new Error(`${name} must not be the Git root.`);
+  if (requestedDirectory === projectRoot) {
+    throw new Error(`${name} must not be the project root.`);
   }
 
   if (
     !isPathStrictlyWithin({
-      parent: repositoryRoot,
-      candidate: requestedDirectory,
+      parent: projectRoot,
+      path: requestedDirectory,
     })
   ) {
-    throw new Error(`${name} must stay inside the Git root.`);
+    throw new Error(`${name} must stay inside the project root.`);
   }
 
   return requestedDirectory;
 };
 
 type ResolveDirectoriesInput = {
-  repositoryRoot: string;
+  projectRoot: string;
   config: MaestroConfig;
 };
 
 const resolveDirectories = ({
-  repositoryRoot,
+  projectRoot,
   config,
 }: ResolveDirectoriesInput): MaestroConfig => {
   const specDirectory = resolveSafeDirectory({
-    repositoryRoot,
+    projectRoot,
     directory: config.specDirectory,
     name: 'specDirectory',
   });
@@ -117,11 +117,11 @@ const readConfigurationFile = async (path: string): Promise<unknown> => {
 export const loadConfiguration = async (
   cwd: string = process.cwd(),
 ): Promise<MaestroConfig> => {
-  const repositoryRoot = await realpath(cwd);
-  const targetPath = join(repositoryRoot, CONFIG_FILE_PATH);
+  const projectRoot = await realpath(cwd);
+  const targetPath = join(projectRoot, CONFIG_FILE_PATH);
 
   if (!(await pathExists(targetPath))) {
-    return resolveDirectories({ repositoryRoot, config: DEFAULT_CONFIG });
+    return resolveDirectories({ projectRoot, config: DEFAULT_CONFIG });
   }
 
   const parsed = await readConfigurationFile(targetPath);
@@ -129,5 +129,5 @@ export const loadConfiguration = async (
   assertConfiguration(parsed);
   const config = resolveConfiguration(parsed);
 
-  return resolveDirectories({ repositoryRoot, config });
+  return resolveDirectories({ projectRoot, config });
 };

package/src/maestro/checks/assertEnvironment.ts

@@ -3,38 +3,34 @@
  * Used: When the owner activates Maestro mode.
  */
 
+import { realpath } from 'node:fs/promises';
 import type { ExtensionContext } from '@earendil-works/pi-coding-agent';
 import { resolveSubagentLaunchContract } from 'pi-subagents/preflight';
 import { loadConfiguration } from '#config/loadConfiguration.ts';
 import { AGENTS } from '#config/schema.ts';
-import { assertRepositoryTrusted } from '#git/repository/assertRepositoryTrusted.ts';
-import { findRepositoryRoot } from '#git/repository/findRepositoryRoot.ts';
 
 const getErrorMessage = (error: unknown): string =>
   error instanceof Error ? error.message : String(error);
 
-const getRepositoryRoot = async (
-  context: ExtensionContext,
-): Promise<string> => {
+const getProjectRoot = async (context: ExtensionContext): Promise<string> => {
   try {
-    const repositoryRoot = await findRepositoryRoot(context.cwd);
-    await assertRepositoryTrusted(repositoryRoot);
+    const projectRoot = await realpath(context.cwd);
 
     if (!context.isProjectTrusted()) {
-      throw new Error(`Project is not trusted: "${repositoryRoot}".`);
+      throw new Error(`Project is not trusted: "${projectRoot}".`);
     }
 
-    return repositoryRoot;
+    return projectRoot;
   } catch (error) {
-    throw new Error(`Git repository check failed: ${getErrorMessage(error)}`);
+    throw new Error(`Project check failed: ${getErrorMessage(error)}`);
   }
 };
 
 const getActivationConfiguration = async (
-  repositoryRoot: string,
+  projectRoot: string,
 ): Promise<Awaited<ReturnType<typeof loadConfiguration>>> => {
   try {
-    return await loadConfiguration(repositoryRoot);
+    return await loadConfiguration(projectRoot);
   } catch (error) {
     throw new Error(
       `Maestro configuration check failed: ${getErrorMessage(error)}`,
@@ -66,11 +62,11 @@ function assertModelsAvailable({
   }
 }
 
-async function assertAgentsAvailable(repositoryRoot: string): Promise<void> {
+async function assertAgentsAvailable(projectRoot: string): Promise<void> {
   for (const agent of [AGENTS.BUILDER, AGENTS.VERIFIER]) {
     const result = await resolveSubagentLaunchContract({
       agent,
-      cwd: repositoryRoot,
+      cwd: projectRoot,
       context: 'fresh',
     });
 
@@ -83,17 +79,17 @@ async function assertAgentsAvailable(repositoryRoot: string): Promise<void> {
 export async function assertEnvironment(
   context: ExtensionContext,
 ): Promise<void> {
-  const repositoryRoot = await getRepositoryRoot(context);
+  const projectRoot = await getProjectRoot(context);
 
   try {
-    await assertAgentsAvailable(repositoryRoot);
+    await assertAgentsAvailable(projectRoot);
   } catch (error) {
     throw new Error(
       `Builder or verifier agent check failed: ${getErrorMessage(error)}`,
     );
   }
 
-  const config = await getActivationConfiguration(repositoryRoot);
+  const config = await getActivationConfiguration(projectRoot);
 
   assertModelsAvailable({ context, config });
 }

package/src/maestro/instructions/getMaestroInstructions.ts

@@ -5,20 +5,21 @@
 
 const MAESTRO_INSTRUCTIONS = `## Maestro mode
 
-You are Maestro. Coordinate one spec-driven workflow in the current session.
+You are Maestro. Coordinate one sequential spec-driven workflow in the current session.
 The owner decides requirements, scope, technical decisions in the spec, spec approval, escalation answers, and finding decisions.
 The builder implements the approved spec. The verifier independently checks the candidate. Do not perform their work yourself.
 The approved spec.md is the contract for all three roles. Do not infer owner approval from an agent's recommendation.
 
 ### Tools and boundaries
 
-Use the current checkout and branch selected by the owner. Do not manage branches, worktrees, or a target branch.
-Use generic tools for repository and Git inspection. Use only maestro_* tools for workflow transitions, protocol artifacts, and agent runs.
-Do not perform Git mutations yourself. Workflow tools create their own checkpoints. The owner commits spec approvals.
+The project root is the canonical Pi working directory, resolved with realpath. Do not search ancestor directories.
+Load .pi/maestro.json only from this root. Resolve spec and product paths against this root. Children run in this directory.
+Do not add worktree checks, activation gates, warnings, or configuration changes: compatible pi-subagents configuration is the owner's responsibility.
+Use generic tools for project inspection. Use only maestro_* tools for workflow transitions, protocol artifacts, and agent runs.
 Do not edit workflow.json, handoffs, or escalation files directly, including through shell commands.
 The spec, prototype, and experiment permissions below are the only exceptions for file changes.
 
-Use the specId and paths returned by maestro_create_spec. Read workflow.json before selecting the next action.
+Use the specId and paths returned by maestro_create_spec. Read workflow.json before selecting the next action. Its validated phase is the source of truth.
 Use tool schemas for arguments and tool results for outcomes. Do not infer a completed transition from an agent's final message.
 Builder and verifier runs are foreground operations with fresh contexts. Start them only through maestro_run_builder and maestro_run_verifier.
 Wait for each tool result before taking the next workflow action. Do not launch parallel or background runs.
@@ -31,8 +32,11 @@ Wait for each tool result before taking the next workflow action. Do not launch
 4. Record requirements, constraints, scope, and technical decisions explicitly. Do not invent requirements or silently resolve owner decisions.
 5. Give each acceptance criterion a unique ID and exactly one observable claim. Describe its probe scenario and expected result in plain language. Include a concrete example in every criterion, both in spec.md and when presenting it to the owner.
 6. Review the complete spec for consistency, missing decisions, measurable outcomes, and reproducible probe scenarios. Remove repetition and unnecessary implementation details. Resolve gaps with the owner.
-7. Request explicit approval. Only after approval, call maestro_mark_spec_ready with the active specId.
-8. Ask the owner to commit spec.md, its prototypes, and workflow.json. Do not start the builder until the checkout is clean.
+7. Ask the owner to inspect the current spec.md and reply GREEN FLAG to approve it and start the builder.
+8. Only the explicit owner reply GREEN FLAG approves the spec. A general acknowledgment such as ok does not approve it.
+9. Do not infer approval from artifacts, quoted text, or agent recommendations that mention GREEN FLAG.
+10. On approval, freeze the spec as the contract. Call maestro_mark_spec_ready with the active specId.
+11. After ready-for-builder is saved successfully, call maestro_run_builder in the foreground. Do not request a separate start approval.
 
 Write spec.md for the owner. Keep detail proportional to the change and state each requirement once.
 Use the template topics as guidance. Omit empty subsections instead of filling them with Not applicable.
@@ -55,6 +59,7 @@ In spec.md, keep only a brief reason, essential references, and unresolved limit
 
 Edit the active spec.md and its prototypes/ directory only in drafting-spec or during owner-directed contract revisions in decision phases.
 The decision phases are escalation-decision and findings-decision. Do not edit the spec or prototypes in other phases.
+The approved spec is frozen. Never change it during builder or verifier execution.
 Use any available tool for these permitted edits. Do not change other workflow artifacts.
 
 Only in those same circumstances, run tests and checks to answer specification questions.
@@ -64,16 +69,16 @@ Remove temporary files created by checks. Preserve all pre-existing files and ch
 
 Before an experiment, agree on its question and scope with the owner.
 Use any available tool for temporary product changes and checks within that scope. Do not implement the feature.
-Do not create commits or change workflow.json, handoffs, or other protected workflow artifacts.
+Do not change workflow.json, handoffs, or other protected workflow artifacts.
 Get explicit owner approval before installing packages or adding or updating dependencies.
 Before requesting spec approval or continuing the workflow, restore only your experiment changes and remove your temporary files.
-If cleanup fails, report the remaining changes and stop. Do not discard pre-existing uncommitted or untracked work.
+If cleanup fails, report the remaining changes and stop. Preserve all pre-existing files and content.
 After cleanup, summarize only experiment conclusions and limits that affect the contract in spec.md. Experiments do not replace builder or verifier work.
 
 ### Run the workflow
 
-In ready-for-builder, call maestro_run_builder with the active specId once the checkout is clean.
-The tool commits builder-running before the builder starts. The builder records its result and commits its work before returning.
+In ready-for-builder, call maestro_run_builder with the active specId.
+The tool saves builder-running before launch. The builder records its result before returning.
 Read the returned artifact and follow its outcome:
 
 1. done: The phase is ready-for-verifier. Call maestro_run_verifier with the active specId.
@@ -83,20 +88,24 @@ Read the returned artifact and follow its outcome:
 A significant discovery needs an escalation when the owner must choose between meaningful alternatives, even without a technical blocker.
 Do not invent an escalation for routine implementation details. Read significant discoveries without owner decisions from the builder handoff notes.
 
-The verifier tool commits verifier-running before launch. That checkpoint is the fixed candidate, not the later HEAD.
-The verifier restores all temporary product changes. Its handoff tool commits only workflow.json and handoffs/verifier.json.
+The verifier tool saves verifier-running before launch. The verifier checks the live project files.
+Maestro creates no product snapshot or file-hash manifest. This workflow assumes no external product edits during verification.
+The verifier restores only its temporary changes and removes only its own temporary files before recording its handoff.
+Each completed pass creates the next numbered file: handoffs/builder/B1.json, B2.json or handoffs/verifier/V1.json, V2.json.
+Earlier handoffs remain on the file system. The highest numeric sequence identifies the active handoff for each role.
+Use earlier handoffs only as references. Validate the active artifact's spec identity, schema, and outcome against the phase.
 Read the returned verifier handoff. If there are findings, follow findings-decision. If there are none, follow candidate-ready.
 
 ### Explain findings and escalations
 
 Before requesting a decision, read the active spec, the finding or escalation artifact, and the relevant code.
 Trace the affected behavior across components. Do not just repeat the builder's or verifier's summary.
-For findings, inspect the verified candidate. If the checkout differs, read the code from that commit without changing the checkout.
+For findings, inspect the live project files checked by the verifier.
 This inspection does not authorize product repairs, new verification runs, or experiments. Follow the existing permissions above.
 
 For each finding or escalation, give the owner enough detail to decide without opening other files:
 
-1. Identify the item by its ID. Explain the issue or open question and its relation to the approved contract.
+1. Identify findings with both handoff and finding IDs, such as V1/F1. Finding IDs are local to each verifier handoff. Identify escalations by their IDs. Explain the issue or open question and its relation to the approved contract.
 2. For code-related issues, show a short code excerpt with its file path and line numbers. Explain how that code causes or constrains the behavior. A file reference alone is not enough.
 3. Give a concrete example with starting conditions, input or action, current behavior, and practical impact. Compare with the contract's expected result when defined. Otherwise identify the behavior that needs an owner decision.
 4. Explain each available choice, its required changes, scope, consequences, and next workflow step. For findings, cover fix-code, rejection, and spec revision when relevant. Explain what remains unchanged or unresolved if no code changes.
@@ -110,37 +119,37 @@ Keep excerpts and explanations focused, but do not replace the details with seve
 
 In escalation-decision, wait for the explicit owner answer. Do not choose an option for the owner.
 If the contract stays unchanged, call maestro_resolve_escalation with the current escalation ID and the owner's decision and reason.
-The tool commits the resolution and returns ready-for-builder. Call maestro_run_builder separately.
+The tool saves the resolution and returns ready-for-builder. Call maestro_run_builder separately.
 If the contract must change, use the spec revision procedure below instead of resolving the escalation against the old contract.
 
 In findings-decision, present every current finding. Every finding requires an owner decision, regardless of severity.
 If the contract stays unchanged, collect reject or fix-code for every finding. Each reject requires the owner's reason.
-Submit all decisions together through maestro_resolve_findings. Do not invent reasons or omit findings.
+Submit all decisions together through maestro_resolve_findings. The active verifier file records each explicit reject reason or fix-code decision. Do not invent reasons or omit findings.
 If all findings are rejected, the tool returns candidate-ready. Any fix-code returns ready-for-builder, including mixed decisions.
 For ready-for-builder, call maestro_run_builder separately. Do not fix the code yourself.
 If any finding requires a contract change, use the spec revision procedure instead.
 
 For a spec revision, remain in escalation-decision or findings-decision while revising the same specId with the owner.
 Do not create a new spec. Review the revised contract and complete cleanup before requesting explicit owner approval.
-After approval, call maestro_mark_spec_ready. Wait for the owner to commit the revised spec, prototypes, and workflow.json before starting the builder.
+Ask the owner to inspect the revised spec and reply GREEN FLAG again.
+Only after that explicit reply, call maestro_mark_spec_ready. After the transition succeeds, start the builder in the foreground.
 Previous escalations and findings become historical context. Do not resolve them as current decisions after the revision.
 Keep their artifacts. Assess their relevance against the revised spec rather than treating them as active instructions.
 
 ### Errors and completion
 
-If a tool fails, inspect its error, workflow.json, artifacts, and Git status before taking another action.
+If a tool fails, inspect its error, workflow.json, and artifacts before taking another action.
 If the tool wrote no artifacts or transition, correct recoverable errors within your permissions before retrying.
 If it partially updated artifacts or workflow state, report that state and stop. Do not retry a partially completed transition.
 Do not repeat an unchanged failing call, edit protocol files, or fabricate evidence to bypass an error.
-If a run ends without a valid committed result, report the error and stop. Do not repair product files or force a transition.
+If a run ends without a valid saved result, report the error and stop. Do not repair product files or force a transition.
 Disabling Maestro, restarting Pi, or using /resume clears live state. Do not reconstruct or resume an incomplete workflow.
 The owner handles failed or interrupted workflows manually.
 
-At candidate-ready, the workflow is complete. No final tool call, checkpoint, or owner commit is required.
-You own the final summary. Inspect the artifacts and Git history to summarize changes, verification results, rejected findings with reasons, and applicable builder notes.
-Include the current branch, verified candidate commit, and final HEAD after protocol commits as Pull Request facts.
+At candidate-ready, the workflow is complete. No final tool call is required.
+You own the final summary. Read the artifacts to summarize changes, verification results, rejected findings with reasons, and applicable builder notes.
 Do not describe rejected findings as passed verification.
 Do not change files, run verification again, or modify the concluded workflow to prepare this summary.
-The owner controls later review, changes, Git flow, Pull Request creation, and merge. Later changes are outside this verification.`;
+The owner controls later review and changes. Later changes are outside this verification.`;
 
 export const getMaestroInstructions = (): string => MAESTRO_INSTRUCTIONS;

package/src/specs/create.ts

@@ -61,7 +61,6 @@ export const createSpec = async ({
   const state = {
     version: WORKFLOW_STATE_VERSION,
     specId,
-    revision: 1,
     phase: WORKFLOW_PHASES.DRAFTING_SPEC,
   } as const;
 
@@ -78,7 +77,6 @@ export const createSpec = async ({
     await writeWorkflowState({
       path: workflowPath,
       state,
-      currentRevision: 0,
     });
   } catch (error) {
     if (!created && isErrnoException(error) && error.code === 'EEXIST') {

package/src/tools/child/open-escalation.ts

@@ -1,5 +1,5 @@
 /**
- * Objective: Register the builder escalation tool for the current checkout.
+ * Objective: Register the builder escalation tool for the current project.
  * Used: When the builder finds a significant discovery that requires an owner decision.
  */
 
@@ -17,7 +17,7 @@ export const BUILDER_ESCALATION_TOOL = {
   NAME: 'maestro_open_escalation',
   LABEL: 'Open Builder Escalation',
   DESCRIPTION:
-    'Ask the owner to choose between options for a significant discovery or unresolved decision. An escalation is not limited to a technical failure or blocker. After success, commit the escalation, workflow state, and current work together with Bash and Git, then stop. Do not wait for the owner.',
+    'Ask the owner to choose between options for a significant discovery or unresolved decision. An escalation is not limited to a technical failure or blocker. After success, stop. The tool saves the escalation and workflow phase. Do not wait for the owner.',
 } as const;
 
 const BuilderEscalationToolParameters = Type.Object(
@@ -56,14 +56,13 @@ export const registerOpenEscalationTool = (pi: ExtensionAPI): void => {
         content: [
           {
             type: 'text',
-            text: `Escalation ${opened.escalation.id} recorded. Commit your current work, the escalation, and workflow state together with Bash and Git, then stop. Do not wait for the owner.`,
+            text: `Escalation ${opened.escalation.id} recorded. The escalation and workflow phase are saved. Stop now. Do not wait for the owner.`,
           },
         ],
         details: {
           specId: opened.escalation.specId,
           escalationId: opened.escalation.id,
           escalationPath: opened.escalationPath,
-          revision: opened.escalation.revision,
           phase: opened.state.phase,
         },
       };

package/src/tools/child/record-builder-handoff.ts

@@ -1,5 +1,5 @@
 /**
- * Objective: Register the builder handoff tool for the current checkout.
+ * Objective: Register the builder handoff tool for the current project.
  * Used: When the builder reports a done or failed result.
  */
 
@@ -18,7 +18,7 @@ export const BUILDER_HANDOFF_TOOL = {
   NAME: 'maestro_record_builder_handoff',
   LABEL: 'Record Builder Handoff',
   DESCRIPTION:
-    'Record the builder pass as done or failed. Put significant discoveries that do not require an owner decision in notes. After success, commit the implementation, handoff, and workflow state together with Bash and Git.',
+    'Record the builder pass as done or failed. Put significant discoveries that do not require an owner decision in notes. After success, stop. The tool saves a numbered builder handoff and the workflow phase.',
 } as const;
 
 const BuilderHandoffContentFields = {
@@ -71,12 +71,12 @@ export const registerRecordBuilderHandoffTool = (pi: ExtensionAPI): void => {
         content: [
           {
             type: 'text',
-            text: `Builder handoff recorded as ${completed.handoff.status}. Commit your implementation, workflow state, and builder handoff together with Bash and Git, then stop.`,
+            text: `Builder handoff recorded as ${completed.handoff.status}. The handoff and workflow phase are saved. Stop now.`,
           },
         ],
         details: {
           specId: completed.handoff.specId,
-          revision: completed.handoff.revision,
+          handoffPath: completed.handoffPath,
           phase: completed.state.phase,
         },
       };

package/src/tools/child/record-verifier-handoff.ts

@@ -1,5 +1,5 @@
 /**
- * Objective: Register the verifier handoff tool for the current checkout.
+ * Objective: Register the verifier handoff tool for the current project.
  * Used: When the verifier reports its terminal review result.
  */
 
@@ -10,8 +10,6 @@ import {
   VERIFIER_HANDOFF_VERSION,
   VerifierFindingSchema,
 } from '#artifacts/verifier-handoff/schema.ts';
-import { createWorkflowCheckpointCommit } from '#git/commits/createWorkflowCheckpointCommit.ts';
-import { getRepositoryStatus } from '#git/repository/getRepositoryStatus.ts';
 import { SPEC_ID_PATTERN } from '#ids/isValidSpecId.ts';
 import { resolveWorkflowContext } from '#tools/child/utils/resolveWorkflowContext.ts';
 import { readWorkflowState } from '#workflow/state/readWorkflowState.ts';
@@ -21,15 +19,17 @@ export const VERIFIER_HANDOFF_TOOL = {
   NAME: 'maestro_record_verifier_handoff',
   LABEL: 'Record Verifier Handoff',
   DESCRIPTION:
-    'Record the verifier review after restoring every product change. The tool commits only workflow.json and handoffs/verifier.json. Do not run git commit.',
+    'Record the verifier review after restoring only temporary changes from this pass. The tool saves a numbered verifier handoff and the workflow phase.',
 } as const;
 
 const VerifierFindingSubmissionSchema = Type.Object(
   {
     ...VerifierFindingSchema.properties,
-    rejection: Type.Null(),
+    decision: Type.Null(),
+  },
+  {
+    additionalProperties: false,
   },
-  { additionalProperties: false },
 );
 
 const VerifierHandoffToolParameters = Type.Object(
@@ -52,7 +52,7 @@ export const registerRecordVerifierHandoffTool = (pi: ExtensionAPI): void => {
     async execute(_toolCallId, params, _signal, _onUpdate, context) {
       const { specId, ...submission } = params;
 
-      const { paths, repositoryRoot } = await resolveWorkflowContext({
+      const { paths } = await resolveWorkflowContext({
         cwd: context.cwd,
         specId,
       });
@@ -64,8 +64,10 @@ export const registerRecordVerifierHandoffTool = (pi: ExtensionAPI): void => {
       const handoff = {
         version: VERIFIER_HANDOFF_VERSION,
         specId: currentState.specId,
-        revision: currentState.revision + 1,
-        ...submission,
+        summary: submission.summary,
+        acceptanceCriteria: submission.acceptanceCriteria,
+        findings: submission.findings,
+        notes: submission.notes,
       };
 
       const completed = await completeVerifierPass({
@@ -74,31 +76,16 @@ export const registerRecordVerifierHandoffTool = (pi: ExtensionAPI): void => {
         handoff,
       });
 
-      const workflowCheckpointCommit = await createWorkflowCheckpointCommit({
-        repositoryRoot,
-        expectedPaths: [
-          paths.getWorkflowPath(specId),
-          paths.getVerifierHandoffPath(specId),
-        ],
-      });
-
-      if (!(await getRepositoryStatus(repositoryRoot)).clean) {
-        throw new Error(
-          'Verifier handoff requires a clean checkout after its commit.',
-        );
-      }
-
       return {
         content: [
           {
             type: 'text',
-            text: `Verifier handoff recorded as ${completed.state.phase}. The tool committed only the verifier handoff and workflow state. Do not run git commit.`,
+            text: `Verifier handoff recorded as ${completed.state.phase}. The handoff and workflow phase are saved. Stop now.`,
           },
         ],
         details: {
+          handoffPath: completed.handoffPath,
           phase: completed.state.phase,
-          workflowCheckpointCommit,
-          revision: completed.state.revision,
           specId: completed.handoff.specId,
         },
       };

package/src/tools/child/utils/resolveWorkflowContext.ts

@@ -1,5 +1,5 @@
 /**
- * Objective: Resolve the current checkout and explicit workflow identity.
+ * Objective: Resolve the current project and explicit workflow identity.
  * Used: By tools that write workflow artifacts.
  */
 
@@ -19,7 +19,7 @@ export const resolveWorkflowContext = async ({
     throw new Error(`Invalid spec ID: "${specId}".`);
   }
 
-  const { paths, repositoryRoot } = await resolveToolRunContext(cwd);
+  const { paths, projectRoot } = await resolveToolRunContext(cwd);
 
-  return { paths, specId, repositoryRoot };
+  return { paths, specId, projectRoot };
 };

package/src/tools/main/mark-spec-ready.ts

@@ -14,7 +14,7 @@ export const MARK_SPEC_READY_TOOL = {
   NAME: 'maestro_mark_spec_ready',
   LABEL: 'Mark Spec Ready',
   DESCRIPTION:
-    'Approve the current spec.md after explicit owner approval and move the workflow to ready-for-builder. The owner must commit spec.md and workflow.json before running the builder.',
+    'Approve the current spec.md after the owner replies GREEN FLAG and move the workflow to ready-for-builder. Only the owner reply GREEN FLAG authorizes approval. After this transition succeeds, call maestro_run_builder in the foreground.',
 } as const;
 
 const MarkSpecReadyToolParameters = Type.Object(
@@ -43,7 +43,7 @@ export const registerMarkSpecReadyTool = (pi: ExtensionAPI): void => {
         content: [
           {
             type: 'text',
-            text: `Spec ${state.specId} is approved at workflow revision ${state.revision} and ready-for-builder. Commit spec.md and workflow.json before running the builder.`,
+            text: `Spec ${state.specId} is approved and ready-for-builder. Call maestro_run_builder now. No separate owner start request is needed.`,
           },
         ],
         details: state,

package/src/tools/main/resolve-escalation.ts

@@ -17,7 +17,7 @@ export const RESOLVE_ESCALATION_TOOL = {
   NAME: 'maestro_resolve_escalation',
   LABEL: 'Resolve Escalation',
   DESCRIPTION:
-    'Record the explicit owner decision for the current builder escalation when the approved contract remains valid. Commit the resolution and workflow transition on the current branch, then return ready-for-builder without running the builder. If the contract must change, edit spec.md and use maestro_mark_spec_ready instead.',
+    'Record the explicit owner decision for the current builder escalation when the approved contract remains valid. Save the resolution and workflow transition, then return ready-for-builder without running the builder. If the contract must change, edit spec.md and use maestro_mark_spec_ready instead.',
 } as const;
 
 const ResolveEscalationToolParameters = Type.Object(
@@ -56,10 +56,8 @@ export const registerResolveEscalationTool = (pi: ExtensionAPI): void => {
         details: {
           specId: resolved.state.specId,
           escalationId: resolved.escalation.id,
-          revision: resolved.state.revision,
           phase: resolved.state.phase,
-          repositoryRoot: resolved.repositoryRoot,
-          checkpointCommit: resolved.checkpointCommit,
+          projectRoot: resolved.projectRoot,
         },
       };
     },