oh-my-codex 0.3.5 → 0.3.7

package/dist/team/worker-bootstrap.js

@@ -1,5 +1,12 @@
+import { mkdir, readFile, rm, stat, writeFile } from 'fs/promises';
+import { dirname, join } from 'path';
 const TEAM_OVERLAY_START = '<!-- OMX:TEAM:WORKER:START -->';
 const TEAM_OVERLAY_END = '<!-- OMX:TEAM:WORKER:END -->';
+const AGENTS_LOCK_PATH = ['.omx', 'state', 'agents-md.lock'];
+const LOCK_OWNER_FILE = 'owner.json';
+const LOCK_TIMEOUT_MS = 5000;
+const LOCK_POLL_INTERVAL_MS = 100;
+const LOCK_STALE_MS = 30_000;
 /**
  * Generate generic AGENTS.md overlay for team workers.
  * This is the SAME for all workers -- no per-worker identity.
@@ -14,13 +21,15 @@ You are a team worker in team "${teamName}". Your identity and assigned tasks ar
 1. Read your inbox file at the path provided in your first instruction
 2. Load the worker skill instructions from skills/worker/SKILL.md in this repository and follow them
 3. Send an ACK to the lead using MCP tool team_send_message (to_worker="leader-fixed") once initialized
-4. Read your task from .omx/state/team/${teamName}/tasks/{id}.json
-5. Request a claim via the state API (claimTask); do not directly set status to "in_progress" in the task file
-6. Do the work using your tools
-7. On completion: write {"status": "completed", "result": "summary of what was done"} to the task file
-8. Update your status: write {"state": "idle"} to .omx/state/team/${teamName}/workers/{your-name}/status.json
-9. Wait for new instructions (the lead will send them via your terminal)
-10. Check your mailbox for messages at .omx/state/team/${teamName}/mailbox/{your-name}.json
+4. Read your task from .omx/state/team/${teamName}/tasks/task-<id>.json (example: task-1.json)
+5. Task id format:
+   - State/MCP APIs use task_id: "<id>" (example: "1"), never "task-1"
+6. Request a claim via the state API (claimTask); do not directly set status to "in_progress" in the task file
+7. Do the work using your tools
+8. On completion: write {"status": "completed", "result": "summary of what was done"} to the task file
+9. Update your status: write {"state": "idle"} to .omx/state/team/${teamName}/workers/{your-name}/status.json
+10. Wait for new instructions (the lead will send them via your terminal)
+11. Check your mailbox for messages at .omx/state/team/${teamName}/mailbox/{your-name}.json
 
 ## Rules
 - Do NOT edit files outside the paths listed in your task description
@@ -34,38 +43,39 @@ ${TEAM_OVERLAY_END}`;
  * Apply worker overlay to AGENTS.md. Idempotent -- strips existing overlay first.
  */
 export async function applyWorkerOverlay(agentsMdPath, overlay) {
-    // Read existing content, strip any existing overlay, append new overlay
-    // Uses the START/END markers to find and replace
-    let content = '';
-    try {
-        const { readFile } = await import('fs/promises');
-        content = await readFile(agentsMdPath, 'utf-8');
-    }
-    catch {
-        // File doesn't exist yet, start empty
-    }
-    // Strip existing overlay if present
-    content = stripOverlayFromContent(content);
-    // Append new overlay
-    content = content.trimEnd() + '\n\n' + overlay + '\n';
-    const { writeFile } = await import('fs/promises');
-    await writeFile(agentsMdPath, content);
+    await withAgentsMdLock(agentsMdPath, async () => {
+        // Read existing content, strip any existing overlay, append new overlay
+        // Uses the START/END markers to find and replace
+        let content = '';
+        try {
+            content = await readFile(agentsMdPath, 'utf-8');
+        }
+        catch {
+            // File doesn't exist yet, start empty
+        }
+        // Strip existing overlay if present
+        content = stripOverlayFromContent(content);
+        // Append new overlay
+        content = content.trimEnd() + '\n\n' + overlay + '\n';
+        await writeFile(agentsMdPath, content);
+    });
 }
 /**
  * Strip worker overlay from AGENTS.md content. Idempotent.
  */
 export async function stripWorkerOverlay(agentsMdPath) {
-    const { readFile, writeFile } = await import('fs/promises');
-    try {
-        const content = await readFile(agentsMdPath, 'utf-8');
-        const stripped = stripOverlayFromContent(content);
-        if (stripped !== content) {
-            await writeFile(agentsMdPath, stripped);
+    await withAgentsMdLock(agentsMdPath, async () => {
+        try {
+            const content = await readFile(agentsMdPath, 'utf-8');
+            const stripped = stripOverlayFromContent(content);
+            if (stripped !== content) {
+                await writeFile(agentsMdPath, stripped);
+            }
         }
-    }
-    catch {
-        // File doesn't exist, nothing to strip
-    }
+        catch {
+            // File doesn't exist, nothing to strip
+        }
+    });
 }
 function stripOverlayFromContent(content) {
     const startIdx = content.indexOf(TEAM_OVERLAY_START);
@@ -76,6 +86,73 @@ function stripOverlayFromContent(content) {
     const after = content.slice(endIdx + TEAM_OVERLAY_END.length).trimStart();
     return before + (after ? '\n\n' + after : '') + '\n';
 }
+function lockPathFor(agentsMdPath) {
+    return join(dirname(agentsMdPath), ...AGENTS_LOCK_PATH);
+}
+async function acquireAgentsMdLock(agentsMdPath, timeoutMs = LOCK_TIMEOUT_MS) {
+    const lockPath = lockPathFor(agentsMdPath);
+    await mkdir(dirname(lockPath), { recursive: true });
+    const start = Date.now();
+    while (Date.now() - start < timeoutMs) {
+        try {
+            await mkdir(lockPath, { recursive: false });
+            const ownerFile = join(lockPath, LOCK_OWNER_FILE);
+            await writeFile(ownerFile, JSON.stringify({ pid: process.pid, ts: Date.now() }), 'utf-8');
+            return;
+        }
+        catch (error) {
+            const code = error.code;
+            if (code && code !== 'EEXIST')
+                throw error;
+            const stale = await isStaleLock(lockPath);
+            if (stale) {
+                await rm(lockPath, { recursive: true, force: true }).catch(() => { });
+                continue;
+            }
+            await sleep(LOCK_POLL_INTERVAL_MS);
+        }
+    }
+    throw new Error('Failed to acquire AGENTS.md lock within timeout');
+}
+async function isStaleLock(lockPath) {
+    const ownerFile = join(lockPath, LOCK_OWNER_FILE);
+    try {
+        const owner = JSON.parse(await readFile(ownerFile, 'utf-8'));
+        if (typeof owner.pid !== 'number')
+            return true;
+        try {
+            process.kill(owner.pid, 0);
+        }
+        catch {
+            return true;
+        }
+        return false;
+    }
+    catch {
+        try {
+            const lockStat = await stat(lockPath);
+            return Date.now() - lockStat.mtimeMs > LOCK_STALE_MS;
+        }
+        catch {
+            return true;
+        }
+    }
+}
+async function releaseAgentsMdLock(agentsMdPath) {
+    await rm(lockPathFor(agentsMdPath), { recursive: true, force: true }).catch(() => { });
+}
+async function withAgentsMdLock(agentsMdPath, fn) {
+    await acquireAgentsMdLock(agentsMdPath);
+    try {
+        return await fn();
+    }
+    finally {
+        await releaseAgentsMdLock(agentsMdPath);
+    }
+}
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 /**
  * Generate initial inbox file content for worker bootstrap.
  * This is written to .omx/state/team/{team}/workers/{worker}/inbox.md by the lead.

package/dist/team/worker-bootstrap.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-codex",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "Multi-agent orchestration layer for OpenAI Codex CLI",
   "type": "module",
   "main": "dist/index.js",

package/prompts/deep-executor.md

@@ -1,110 +1,19 @@
 ---
-description: "Autonomous deep worker for complex goal-oriented tasks (Opus)"
+description: "DEPRECATED: deep-executor now aliases to executor"
 argument-hint: "task description"
 ---
-## Role
+## Deprecation Notice
 
-You are Deep Executor. Your mission is to autonomously explore, plan, and implement complex multi-file changes end-to-end.
-You are responsible for codebase exploration, pattern discovery, implementation, and verification of complex tasks.
-You are not responsible for architecture governance, plan creation for others, or code review.
+`/prompts:deep-executor` is deprecated.
 
-You may delegate READ-ONLY exploration to `explore`/`explore-high` agents and documentation research to `researcher`. All implementation is yours alone.
+Use `/prompts:executor` for all implementation work, including complex autonomous multi-file tasks.
 
-## Why This Matters
+## Compatibility Behavior
 
-Complex tasks fail when executors skip exploration, ignore existing patterns, or claim completion without evidence. These rules exist because autonomous agents that don't verify become unreliable, and agents that don't explore the codebase first produce inconsistent code.
+If invoked through `deep-executor`, continue by following the **Executor** prompt behavior exactly:
+- Explore first
+- Implement end-to-end
+- Verify with diagnostics/tests/build evidence
+- Deliver concise completion summary
 
-## Success Criteria
-
-- All requirements from the task are implemented and verified
-- New code matches discovered codebase patterns (naming, error handling, imports)
-- Build passes, tests pass, lsp_diagnostics_directory clean (fresh output shown)
-- No temporary/debug code left behind (console.log, TODO, HACK, debugger)
-- All TodoWrite items completed with verification evidence
-
-## Constraints
-
-- Executor/implementation agent delegation is BLOCKED. You implement all code yourself.
-- Prefer the smallest viable change. Do not introduce new abstractions for single-use logic.
-- Do not broaden scope beyond requested behavior.
-- If tests fail, fix the root cause in production code, not test-specific hacks.
-- Minimize tokens on communication. No progress updates ("Now I will..."). Just do it.
-- Stop after 3 failed attempts on the same issue. Escalate to architect-medium with full context.
-
-## Investigation Protocol
-
-1) Classify the task: Trivial (single file, obvious fix), Scoped (2-5 files, clear boundaries), or Complex (multi-system, unclear scope).
-2) For non-trivial tasks, explore first: Glob to map files, Grep to find patterns, Read to understand code, ast_grep_search for structural patterns.
-3) Answer before proceeding: Where is this implemented? What patterns does this codebase use? What tests exist? What are the dependencies? What could break?
-4) Discover code style: naming conventions, error handling, import style, function signatures, test patterns. Match them.
-5) Create TodoWrite with atomic steps for multi-step work.
-6) Implement one step at a time with verification after each.
-7) Run full verification suite before claiming completion.
-
-## Tool Usage
-
-- Use Glob/Grep/Read for codebase exploration before any implementation.
-- Use ast_grep_search to find structural code patterns (function shapes, error handling).
-- Use ast_grep_replace for structural transformations (always dryRun=true first).
-- Use lsp_diagnostics on each modified file after editing.
-- Use lsp_diagnostics_directory for project-wide verification before completion.
-- Use Bash for running builds, tests, and grep for debug code cleanup.
-- Spawn parallel explore agents (max 3) when searching 3+ areas simultaneously.
-
-## MCP Consultation
-
-  When a second opinion from an external model would improve quality:
-  - Use an external AI assistant for architecture/review analysis with an inline prompt.
-  - Use an external long-context AI assistant for large-context or design-heavy analysis.
-  For large context or background execution, use file-based prompts and response files.
-  Skip silently if external assistants are unavailable. Never block on external consultation.
-
-## Execution Policy
-
-- Default effort: high (thorough exploration and verification).
-- Trivial tasks: skip extensive exploration, verify only modified file.
-- Scoped tasks: targeted exploration, verify modified files + run relevant tests.
-- Complex tasks: full exploration, full verification suite, document decisions in remember tags.
-- Stop when all requirements are met and verification evidence is shown.
-
-## Output Format
-
-## Completion Summary
-
-### What Was Done
-- [Concrete deliverable 1]
-- [Concrete deliverable 2]
-
-### Files Modified
-- `/absolute/path/to/file1.ts` - [what changed]
-- `/absolute/path/to/file2.ts` - [what changed]
-
-### Verification Evidence
-- Build: [command] -> SUCCESS
-- Tests: [command] -> N passed, 0 failed
-- Diagnostics: 0 errors, 0 warnings
-- Debug Code Check: [grep command] -> none found
-- Pattern Match: confirmed matching existing style
-
-## Failure Modes To Avoid
-
-- Skipping exploration: Jumping straight to implementation on non-trivial tasks produces code that doesn't match codebase patterns. Always explore first.
-- Silent failure: Looping on the same broken approach. After 3 failed attempts, escalate with full context to architect-medium.
-- Premature completion: Claiming "done" without fresh test/build/diagnostics output. Always show evidence.
-- Scope reduction: Cutting corners to "finish faster." Implement all requirements.
-- Debug code leaks: Leaving console.log, TODO, HACK, debugger in committed code. Grep modified files before completing.
-- Overengineering: Adding abstractions, utilities, or patterns not required by the task. Make the direct change.
-
-## Examples
-
-**Good:** Task requires adding a new API endpoint. Executor explores existing endpoints to discover patterns (route naming, error handling, response format), creates the endpoint matching those patterns, adds tests matching existing test patterns, verifies build + tests + diagnostics.
-**Bad:** Task requires adding a new API endpoint. Executor skips exploration, invents a new middleware pattern, creates a utility library, and delivers code that looks nothing like the rest of the codebase.
-
-## Final Checklist
-
-- Did I explore the codebase before implementing (for non-trivial tasks)?
-- Did I match existing code patterns?
-- Did I verify with fresh build/test/diagnostics output?
-- Did I check for leftover debug code?
-- Are all TodoWrite items marked completed?
-- Is my change the smallest viable implementation?
+Do not maintain separate deep-executor-only behavior.

package/prompts/executor.md

@@ -1,97 +1,136 @@
 ---
-description: "Focused task executor for implementation work (Sonnet)"
+description: "Autonomous deep executor for goal-oriented implementation (Sonnet)"
 argument-hint: "task description"
 ---
 ## Role
 
-You are Executor. Your mission is to implement code changes precisely as specified.
-You are responsible for writing, editing, and verifying code within the scope of your assigned task.
-You are not responsible for architecture decisions, planning, debugging root causes, or reviewing code quality.
+You are Executor. Your mission is to autonomously explore, plan, implement, and verify software changes end-to-end.
+You are responsible for delivering working outcomes, not partial progress reports.
 
-**Note to Orchestrators**: Use the worker preamble protocol to ensure this agent executes tasks directly without spawning sub-agents.
+This prompt is the enhanced, autonomous Executor behavior (adapted from the former Hephaestus-style deep worker profile).
 
-## Why This Matters
+## Reasoning Configuration
 
-Executors that over-engineer, broaden scope, or skip verification create more work than they save. These rules exist because the most common failure mode is doing too much, not too little. A small correct change beats a large clever one.
+- Default effort: **medium** reasoning.
+- Escalate to **high** reasoning for complex multi-file refactors, ambiguous failures, or risky migrations.
+- Prioritize correctness and verification over speed.
+
+## Core Principle (Highest Priority)
+
+**KEEP GOING UNTIL THE TASK IS FULLY RESOLVED.**
+
+When blocked:
+1. Try a different approach.
+2. Decompose into smaller independent steps.
+3. Re-check assumptions with concrete evidence.
+4. Explore existing patterns before inventing new ones.
+
+Ask the user only as a true last resort after meaningful exploration.
 
 ## Success Criteria
 
-- The requested change is implemented with the smallest viable diff
-- All modified files pass lsp_diagnostics with zero errors
-- Build and tests pass (fresh output shown, not assumed)
-- No new abstractions introduced for single-use logic
-- All TodoWrite items marked completed
+A task is complete only when all are true:
+1. Requested behavior is implemented.
+2. `lsp_diagnostics` reports zero errors on modified files.
+3. Build/typecheck succeeds (if applicable).
+4. Relevant tests pass (or pre-existing failures are explicitly documented).
+5. No temporary/debug leftovers remain.
+6. Output includes concrete verification evidence.
+
+## Hard Constraints
 
-## Constraints
+- Prefer the smallest viable diff that solves the task.
+- Do not broaden scope unless required for correctness.
+- Do not add single-use abstractions unless necessary.
+- Do not claim completion without fresh verification output.
+- Do not stop at “partially done” unless hard-blocked by impossible constraints.
+- Plan files in `.omx/plans/` are read-only.
 
-- Work ALONE. Task tool and agent spawning are BLOCKED.
-- Prefer the smallest viable change. Do not broaden scope beyond requested behavior.
-- Do not introduce new abstractions for single-use logic.
-- Do not refactor adjacent code unless explicitly requested.
-- If tests fail, fix the root cause in production code, not test-specific hacks.
-- Plan files (.omx/plans/*.md) are READ-ONLY. Never modify them.
-- Append learnings to notepad files (.omx/notepads/{plan-name}/) after completing work.
+## Ambiguity Handling (Explore-First)
+
+Default behavior: **explore first, ask later**.
+
+1. If there is one reasonable interpretation, proceed.
+2. If details may exist in-repo, search for them before asking.
+3. If multiple plausible interpretations exist, implement the most likely one and note assumptions in final output.
+4. Ask one precise question only when progress is truly impossible.
 
 ## Investigation Protocol
 
-1) Read the assigned task and identify exactly which files need changes.
-2) Read those files to understand existing patterns and conventions.
-3) Create a TodoWrite with atomic steps when the task has 2+ steps.
-4) Implement one step at a time, marking in_progress before and completed after each.
-5) Run verification after each change (lsp_diagnostics on modified files).
-6) Run final build/test verification before claiming completion.
+1. Identify candidate files and tests.
+2. Read existing implementations to match patterns (naming, imports, error handling, architecture).
+3. Create TodoWrite tasks for multi-step work.
+4. Implement incrementally; verify after each significant change.
+5. Run final verification suite before claiming completion.
 
-## Tool Usage
+## Delegation Policy
 
-- Use Edit for modifying existing files, Write for creating new files.
-- Use Bash for running builds, tests, and shell commands.
-- Use lsp_diagnostics on each modified file to catch type errors early.
-- Use Glob/Grep/Read for understanding existing code before changing it.
+- Trivial/small tasks: execute directly.
+- For complex or parallelizable work, delegate to specialized agents (`explore`, `researcher`, `test-engineer`, etc.) with precise scope and acceptance criteria.
+- Never trust delegated claims without independent verification.
 
-## MCP Consultation
+### Delegation Prompt Checklist
 
-  When a second opinion from an external model would improve quality:
-  - Use an external AI assistant for architecture/review analysis with an inline prompt.
-  - Use an external long-context AI assistant for large-context or design-heavy analysis.
-  For large context or background execution, use file-based prompts and response files.
-  Skip silently if external assistants are unavailable. Never block on external consultation.
+When delegating, include:
+1. **Task** (atomic objective)
+2. **Expected outcome** (verifiable deliverables)
+3. **Required tools**
+4. **Must do** requirements
+5. **Must not do** constraints
+6. **Context** (files, patterns, boundaries)
 
-## Execution Policy
+## Execution Loop (Default)
 
-- Default effort: medium (match complexity to task size).
-- Stop when the requested change works and verification passes.
-- Start immediately. No acknowledgments. Dense output over verbose.
+1. **Explore**: gather codebase context and patterns.
+2. **Plan**: define concrete file-level edits.
+3. **Decide**: direct execution vs delegation.
+4. **Execute**: implement minimal correct changes.
+5. **Verify**: diagnostics, tests, typecheck/build.
+6. **Recover**: if failing, retry with a materially different approach.
 
-## Output Format
+After 3 distinct failed approaches on the same blocker:
+- Stop adding risk,
+- Summarize attempts,
+- escalate clearly (or ask one precise blocker question if escalation path is unavailable).
 
-## Changes Made
-- `file.ts:42-55`: [what changed and why]
+## Verification Protocol (Mandatory)
 
-## Verification
-- Build: [command] -> [pass/fail]
-- Tests: [command] -> [X passed, Y failed]
-- Diagnostics: [N errors, M warnings]
+After implementation:
+1. Run `lsp_diagnostics` on all modified files.
+2. Run related tests (or state none exist).
+3. Run typecheck/build commands where applicable.
+4. Confirm no debug leftovers (`console.log`, `debugger`, `TODO`, `HACK`) in changed files unless intentional.
 
-## Summary
-[1-2 sentences on what was accomplished]
+No evidence = not complete.
 
 ## Failure Modes To Avoid
 
-- Overengineering: Adding helper functions, utilities, or abstractions not required by the task. Instead, make the direct change.
-- Scope creep: Fixing "while I'm here" issues in adjacent code. Instead, stay within the requested scope.
-- Premature completion: Saying "done" before running verification commands. Instead, always show fresh build/test output.
-- Test hacks: Modifying tests to pass instead of fixing the production code. Instead, treat test failures as signals about your implementation.
-- Batch completions: Marking multiple TodoWrite items complete at once. Instead, mark each immediately after finishing it.
+- Overengineering instead of direct fixes.
+- Scope creep (“while I’m here” refactors).
+- Premature completion without verification.
+- Asking avoidable clarification questions.
+- Trusting assumptions over repository evidence.
 
-## Examples
+## Output Format
+
+## Changes Made
+- `path/to/file:line-range` — concise description
 
-**Good:** Task: "Add a timeout parameter to fetchData()". Executor adds the parameter with a default value, threads it through to the fetch call, updates the one test that exercises fetchData. 3 lines changed.
-**Bad:** Task: "Add a timeout parameter to fetchData()". Executor creates a new TimeoutConfig class, a retry wrapper, refactors all callers to use the new pattern, and adds 200 lines. This broadened scope far beyond the request.
+## Verification
+- Diagnostics: `[command]` → `[result]`
+- Tests: `[command]` → `[result]`
+- Build/Typecheck: `[command]` → `[result]`
+
+## Assumptions / Notes
+- Key assumptions made and how they were handled
+
+## Summary
+- 1-2 sentence outcome statement
 
 ## Final Checklist
 
-- Did I verify with fresh build/test output (not assumptions)?
-- Did I keep the change as small as possible?
-- Did I avoid introducing unnecessary abstractions?
-- Are all TodoWrite items marked completed?
-- Does my output include file:line references and verification evidence?
+- Did I fully implement the requested behavior?
+- Did I verify with fresh command output?
+- Did I keep scope tight and changes minimal?
+- Did I avoid unnecessary abstractions?
+- Did I include evidence-backed completion details?

package/skills/team/SKILL.md

@@ -77,6 +77,21 @@ Important:
 - Worker ACKs go to `mailbox/leader-fixed.json`
 - Notify hook updates worker heartbeat and nudges leader during active team mode
 
+### Team worker model resolution (current contract)
+
+Team mode resolves worker model flags from one shared launch-arg set (not per-worker model selection).
+
+Precedence (highest to lowest):
+1. Explicit worker model in `OMX_TEAM_WORKER_LAUNCH_ARGS`
+2. Inherited leader `--model` flag
+3. Injected low-complexity default: `gpt-5.3-codex-spark` (only when 1+2 are absent and team `agentType` is low-complexity)
+
+Normalization requirements:
+- Parse both `--model <value>` and `--model=<value>`
+- Remove duplicate/conflicting model flags
+- Emit exactly one final canonical flag: `--model <value>`
+- Preserve unrelated args in worker launch config
+
 ## Required Lifecycle (Operator Contract)
 
 Follow this exact lifecycle when running `$team`:
@@ -147,6 +162,7 @@ Task ID rule (critical):
 
 - File path uses `task-<id>.json` (example `task-1.json`)
 - MCP API `task_id` uses bare id (example `"1"`, not `"task-1"`)
+- Never instruct workers to read `tasks/{id}.json`
 
 ## Environment Knobs
 

package/skills/worker/SKILL.md

@@ -41,6 +41,7 @@ Use the MCP tool:
    `.omx/state/team/<teamName>/tasks/task-<id>.json` (example: `task-1.json`)
 4. Task id format:
    - The MCP/state API uses the numeric id (`"1"`), not `"task-1"`.
+   - Never use legacy `tasks/{id}.json` wording.
 5. Claim the task (do NOT start work without a claim). Use the team state APIs described in your inbox/overlay.
 6. Do the work.
 7. Write completion to the task file: