From d86aa2a50e3a40921568e46aa990d1e7a53b1090 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 2 Nov 2026 03:03:35 +0000 Subject: [PATCH 1/3] fix cloud worker spawn, deslop command, and MCP allowlist Cloud workers start as their own `devin --cloud` shell session, because `run_subagent` has no cloud field and `--print` exits after one response. Invoke the embedded deslop skill as `/pstack:deslop`. Grant read-only profiles `mcp__*` and discover servers with `devin mcp list`. Co-authored-by: Kaitian Xie --- docs/guide/02-poteto-mode.md | 2 +- docs/guide/05-build-and-clean.md | 4 ++-- skills/poteto-help/SKILL.md | 2 +- skills/poteto-mode/SKILL.md | 2 +- skills/poteto-mode/playbooks/autopilot-full.md | 4 ++-- skills/poteto-mode/playbooks/multi-phase-plan.md | 4 ++-- skills/poteto-mode/playbooks/opening-a-pr.md | 4 ++-- skills/poteto-mode/playbooks/orchestrate.md | 4 ++-- skills/poteto-mode/playbooks/shipping.md | 2 +- skills/setup-pstack/SKILL.md | 5 +---- skills/swarm/SKILL.md | 2 +- skills/why/SKILL.md | 2 +- 12 files changed, 17 insertions(+), 20 deletions(-) diff --git a/docs/guide/02-poteto-mode.md b/docs/guide/02-poteto-mode.md index d827b34..69f50fd 100644 --- a/docs/guide/02-poteto-mode.md +++ b/docs/guide/02-poteto-mode.md @@ -104,7 +104,7 @@ A long chat accumulates context from the last task. When you change subjects, sa ## Give parallel work its own machine -If you run several agents against one repository on one computer, they will fight over the working tree, the ports, and the build output. The cleanest isolation is a [cloud Devin session](https://docs.devin.ai/cli/cloud) (`devin --cloud -p ""`). Each one gets its own VM and branch, so it can install dependencies, run your app, and record video of the result without touching your machine. Ask the parent chat to hand work to cloud sessions. +If you run several agents against one repository on one computer, they will fight over the working tree, the ports, and the build output. The cleanest isolation is a [cloud Devin session](https://docs.devin.ai/cli/cloud) (`devin --cloud ""`). Each one gets its own VM and branch, so it can install dependencies, run your app, and record video of the result without touching your machine. Ask the parent chat to hand work to cloud sessions. When the work has to stay local, ask for a worktree up front: diff --git a/docs/guide/05-build-and-clean.md b/docs/guide/05-build-and-clean.md index b720d96..ea92522 100644 --- a/docs/guide/05-build-and-clean.md +++ b/docs/guide/05-build-and-clean.md @@ -56,7 +56,7 @@ In context, that's enough. [`/pstack:tdd`](../../skills/tdd/SKILL.md) writes the ## Clean before you commit -The [Opening a PR playbook](../../skills/poteto-mode/playbooks/opening-a-pr.md) runs a slop-strip pass on the diff before each commit and applies [`/pstack:unslop`](../../skills/unslop/SKILL.md) to the PR description and commit bodies. +The [Opening a PR playbook](../../skills/poteto-mode/playbooks/opening-a-pr.md) runs `/pstack:deslop` on the diff before each commit and applies [`/pstack:unslop`](../../skills/unslop/SKILL.md) to the PR description and commit bodies. For prose, `/pstack:unslop` takes a target and any extra rules you have: @@ -76,7 +76,7 @@ Comments need their own pass, and not from the agent that wrote them. An author [`/pstack:no-comments`](../../skills/no-comments/SKILL.md) spawns [Comment Sicko](../../agents/comment-sicko.md), a read-only reviewer with a short keep list: license headers, doc comments on a public API, links that explain what code can't, behavior forced by an external dependency you can't reshape. Everything else goes. A surprise in your own code gets no such pass. The comment comes back as a refactor flag, and `/pstack:no-comments` fixes the flags it accepts at the root cause. When a comment claims a constraint, "do not remove", the skill offers to encode the claim as a type, test, or lint. Either way, the comment comes out. -The division of labor is worth keeping straight. `/deslop` cleans slop out of the code, `/pstack:unslop` cleans it out of prose, and `/pstack:no-comments` hands the comments to a reviewer who didn't write them. +The division of labor is worth keeping straight. `/pstack:deslop` cleans slop out of the code, `/pstack:unslop` cleans it out of prose, and `/pstack:no-comments` hands the comments to a reviewer who didn't write them. **Pitfall:** cleanup is not optional polish. A diff with narrating comments and defensive dead weight reads as unfinished to reviewers, and the extra code is where the next bug hides. If the diff feels padded, say `deslop it` before you commit, not after review calls it out. diff --git a/skills/poteto-help/SKILL.md b/skills/poteto-help/SKILL.md index 827905c..b41a9d2 100644 --- a/skills/poteto-help/SKILL.md +++ b/skills/poteto-help/SKILL.md @@ -136,7 +136,7 @@ Principles are one-rule skills that `/pstack:poteto-mode` reads and cites in its | A new model choice had no effect | The rule from `/pstack:setup-pstack` applies to new chats. Start one. | | Runs cost more than expected | See the cost paragraph under Get set up. | | A skill didn't load on its own | Only `/pstack:setup-pstack` loads from the user's words. The others load when the user types them or when `/pstack:poteto-mode` runs them, and it doesn't run every skill. | -| Parallel agents overwrote each other | Give each agent its own worktree, or run them as cloud Devin sessions (`devin --cloud -p`), which each get their own machine. | +| Parallel agents overwrote each other | Give each agent its own worktree, or run them as cloud Devin sessions (`devin --cloud`), which each get their own machine. | | An overnight run moved but finished nothing | `/loop` needs a check that can pass or fail, not a duration. See [guide page 7](../../docs/guide/07-overnight.md). | | The reply claims success from a green build | Ask for the real command, flow, stored value, or profile. That's the prove-it-works principle. | diff --git a/skills/poteto-mode/SKILL.md b/skills/poteto-mode/SKILL.md index b9b7b53..32a34aa 100644 --- a/skills/poteto-mode/SKILL.md +++ b/skills/poteto-mode/SKILL.md @@ -24,7 +24,7 @@ Remaining triggers: - Nontrivial multi-step → write the throughput checkpoint (Feature step 3). - Any prose surface, your reply to the user included → the **unslop** skill. Write the reply per **Writing the reply**. Agent-facing prose also follows the Authoring or modifying a skill playbook (`playbooks/authoring-a-skill.md`). - Docs, RFCs, readmes, PR descriptions, or commit messages → the **technical-writing** skill (`/pstack:technical-writing`). -- Before commit → the `deslop` skill (`/deslop`). +- Before commit → the `deslop` skill (`/pstack:deslop`). - Before review → the **no-comments** skill (`/pstack:no-comments`). - Shipping UI / IDE / CLI → the matching control skill. pstack includes `control-cli` (CLIs and TUIs) and `control-ui` (browser / Electron / web UIs). For bug fixes, reproduce first on the same surface yourself. Hand to the user only under the narrow Bug fix step 1 exception. - Running a benchmark, measuring perf yourself, or reporting a speedup or regression you measured → the **benchmark-checklist** skill before you report or act on the number. diff --git a/skills/poteto-mode/playbooks/autopilot-full.md b/skills/poteto-mode/playbooks/autopilot-full.md index e1d12dd..562ec92 100644 --- a/skills/poteto-mode/playbooks/autopilot-full.md +++ b/skills/poteto-mode/playbooks/autopilot-full.md @@ -5,9 +5,9 @@ A verdict covers one patch and green CI covers one head. Step 4 runs a full swarm once, and again only for a major change. The patch-id rule in `playbooks/shipping.md` can carry a lane's result, and every new head needs its own green CI. 1. **The operator's gates come first.** The grant covers only the queue's items, so items the operator names as theirs and PRs outside the queue stop at merge-ready. A request to state the plan is not a go. -2. **Spawn one owner per PR, and keep its work where a replacement can find it.** Resolve the forge once for the program. GitHub CLI (`gh`) is the default. If `command -v origin` succeeds and Origin can resolve the repository, use `origin pr` for every PR operation. Otherwise stay on `gh` and record the fallback. Never require Graphite (`gt`). Each owner is a cloud Devin session (`devin --cloud -p ""`) that builds, opens its PR per `playbooks/opening-a-pr.md`, proves the change on the real artifact, babysits to green per `playbooks/babysit.md`, and merges once steps 4 and 5 clear it. +2. **Spawn one owner per PR, and keep its work where a replacement can find it.** Resolve the forge once for the program. GitHub CLI (`gh`) is the default. If `command -v origin` succeeds and Origin can resolve the repository, use `origin pr` for every PR operation. Otherwise stay on `gh` and record the fallback. Never require Graphite (`gt`). Each owner is its own shell session (`devin --cloud ""`; `run_subagent` has no cloud option) that builds, opens its PR per `playbooks/opening-a-pr.md`, proves the change on the real artifact, babysits to green per `playbooks/babysit.md`, and merges once steps 4 and 5 clear it. - Open the PR early so CI and bots run alongside the work. The code is ready only after the slop-strip (the `deslop` skill (`/deslop`)) and the `/pstack:no-comments` pass, so the full swarm runs on finished code. Then rebase onto current trunk and report the code-ready head before self-proof, so verification runs on the base the patch lands on. Report every later head, and merge-ready once self-proof, CI, and babysit are done. Fix rounds stay on that base unless trunk conflicts, breaks CI, or lands a known concurrent change to the same files, because each rebase restarts CI. Run the repo's checks for the touched paths on the committed head before the code-ready push and before a later push that needs a verifier. + Open the PR early so CI and bots run alongside the work. The code is ready only after the slop-strip (the `deslop` skill (`/pstack:deslop`)) and the `/pstack:no-comments` pass, so the full swarm runs on finished code. Then rebase onto current trunk and report the code-ready head before self-proof, so verification runs on the base the patch lands on. Report every later head, and merge-ready once self-proof, CI, and babysit are done. Fix rounds stay on that base unless trunk conflicts, breaks CI, or lands a known concurrent change to the same files, because each rebase restarts CI. Run the repo's checks for the touched paths on the committed head before the code-ready push and before a later push that needs a verifier. Assume the VM dies. Soon after starting, push and start a decision trail in the root agent's store (path in the system prompt) per the **show-me-your-work** skill, then push each finished unit before you start the next. Whoever spawns a subagent records its id, state, and a stuck-after runtime from past runs of its kind in that store, so the root can probe it if the parent dies. Force-push only your own branch, with `--force-with-lease` pinned to the SHA you last pushed or took over, and on any push you did not make, stop and report to the root. 3. **Run owners in parallel off trunk, never stacked,** so each PR lands on its own. diff --git a/skills/poteto-mode/playbooks/multi-phase-plan.md b/skills/poteto-mode/playbooks/multi-phase-plan.md index 8e509fc..f414efd 100644 --- a/skills/poteto-mode/playbooks/multi-phase-plan.md +++ b/skills/poteto-mode/playbooks/multi-phase-plan.md @@ -56,7 +56,7 @@ Tests alone are not sufficient verification. A PR is verified only when its unit - [ ] Resolve the forge once. Default to `gh`; if `command -v origin` succeeds and Origin can resolve the repository, use `origin pr` for every PR operation. Record any fallback to `gh`. Never require `gt`. - [ ] Open the PR ready, never draft, per **Opening a PR**. Use the run's built-in PR tool when it has one, else `origin pr create --status open --base ` or `gh pr create --base ` according to the resolved forge. A stack child targets its parent branch. - [ ] Run the repo's lint and typecheck once before the PR-facing push. Push with hooks on. -- [ ] Run `/deslop` before each commit and `/pstack:no-comments` before review. +- [ ] Run `/pstack:deslop` before each commit and `/pstack:no-comments` before review. - [ ] Triage every Bugbot and security-reviewer comment per `../references/bugbot-triage.md`. - [ ] Rebase onto current trunk before the code-ready report and babysit. Keep that merge base in fix rounds. Rebase again only at merge prep, on a `git merge-tree` conflict with trunk, on a CI failure that comes from a change on trunk, or when a known concurrent change to the same files lands. @@ -68,7 +68,7 @@ Tests alone are not sufficient verification. A PR is verified only when its unit ### Boot recipe, for every live lane -Each live lane runs on its own cloud VM (a `devin --cloud -p` session) or worktree at the PR head. Drive through `control-ui` or `control-cli`. +Each live lane runs on its own cloud VM (its own shell session, `devin --cloud ""`; `run_subagent` has no cloud option) or worktree at the PR head. Drive through `control-ui` or `control-cli`. - [ ] `git fetch origin && git checkout `. - [ ] diff --git a/skills/poteto-mode/playbooks/opening-a-pr.md b/skills/poteto-mode/playbooks/opening-a-pr.md index b5a2b17..654baa7 100644 --- a/skills/poteto-mode/playbooks/opening-a-pr.md +++ b/skills/poteto-mode/playbooks/opening-a-pr.md @@ -6,7 +6,7 @@ Invoked at the end of every other playbook. **Commits.** Commit liberally. Rebase into small, ordered commits before opening PRs. Each commit is a future PR: landable, ordered to tell the story. Amend when the fix belongs in a just-made commit. New commit when separable. Commit bodies don't restate the subject. -**PRs.** Run `/deslop` over the diff before commit and `/pstack:no-comments` before review. Write every PR title, description, and commit body with `/pstack:technical-writing` (every layer except Diátaxis, and apply the STE vocabulary rules: one word per action, keep articles, a plain verb over `-ing` where one works), then apply `/pstack:unslop`. +**PRs.** Run `/pstack:deslop` over the diff before commit and `/pstack:no-comments` before review. Write every PR title, description, and commit body with `/pstack:technical-writing` (every layer except Diátaxis, and apply the STE vocabulary rules: one word per action, keep articles, a plain verb over `-ing` where one works), then apply `/pstack:unslop`. **Titles.** Conventional Commits `type(scope): subject`, no trailing period. Type such as `feat`, `fix`, `docs`, `refactor`, `test`, `chore`, or `perf`. Scope is the area, such as `pstack` or `poteto-mode`. Subject is short, imperative, and names a real symbol when one carries the change, for example `fix(pstack): retarget opening-a-pr babysit trigger`. @@ -31,4 +31,4 @@ After the sections, attach videos or screenshots when they prove a claim. Full S **Babysit.** Opening a PR does not start a babysit. Post the URL and keep building. Finish the phase or stack first. Run a separate babysit pass only when the user asks for one after the whole stack exists. A babysit for each new PR stalls the build and spends checks on commits later waves restart. Push back when feedback drifts from intent. -A subagent that opens a PR runs `/deslop` and `/pstack:no-comments`, and posts the URL. It returns to the parent without babysitting, unless it is an Autopilot-full or Autopilot-stack owner. That owner's brief assigns the babysit loop and is the ask `playbooks/babysit.md` waits for. The owner starts the loop after its code-ready report, reports merge-ready, and is exempt from the rules here and in `playbooks/babysit.md` that hold babysitting until a whole stack is built. +A subagent that opens a PR runs `/pstack:deslop` and `/pstack:no-comments`, and posts the URL. It returns to the parent without babysitting, unless it is an Autopilot-full or Autopilot-stack owner. That owner's brief assigns the babysit loop and is the ask `playbooks/babysit.md` waits for. The owner starts the loop after its code-ready report, reports merge-ready, and is exempt from the rules here and in `playbooks/babysit.md` that hold babysitting until a whole stack is built. diff --git a/skills/poteto-mode/playbooks/orchestrate.md b/skills/poteto-mode/playbooks/orchestrate.md index 9bbcd45..7c20ff3 100644 --- a/skills/poteto-mode/playbooks/orchestrate.md +++ b/skills/poteto-mode/playbooks/orchestrate.md @@ -2,12 +2,12 @@ **You run the program, never the code. Decide which agent does each piece of work, then check what each one produces.** For a standing project handed to one coordinator chat: multi-day, many stacked PRs, dozens to hundreds of subagents, few human turns. One task driven to a predicate is Autonomous run. One ambitious run that needs a bespoke workflow is figure-it-out. Work that one agent could finish inside the session's budget is not a program. -Run it with your own tools. Spawn workers with `run_subagent`. Keep the program's state in the current agent's store (path in the system prompt). Watch each PR with PR and CI event subscriptions when your harness has them. Call no scripts, run no polling loops, and never relay messages or status between agents. +Run it with your own tools. Spawn on-machine workers with `run_subagent`. Keep the program's state in the current agent's store (path in the system prompt). Watch each PR with PR and CI event subscriptions when your harness has them. Call no scripts, run no polling loops, and never relay messages or status between agents. #### Topology - **One owner per PR.** The owner is the only writer of its branch and carries the PR from build to merge. Only the owner pushes, rebases, or retargets it. Closing or retargeting a base PR orphans every PR above it, so the owner does that only on your call. You never author or edit code. Conflicted merges, chain rebases, and fixes go to owners. -- **A fresh worker for each independent task.** Its kickoff carries everything it needs, including each upstream report it depends on, pasted in full. Workers can't see their siblings. Run workers as a cloud Devin session (`devin --cloud -p ""`) unless the work needs this machine: a `control-ui` or `control-cli` runtime check, local session transcripts, a simulator, or auth that exists only here. Cloud sessions load plugin skills but not plugin subagent profiles, so a cloud worker cannot spawn `pstack-*` or `pstack:poteto-agent` delegates. Keep cloud workers leaf-level and run anything that fans out locally. Pick each subagent's reasoning level and fast or standard speed for the job, per the Subagents section. +- **A fresh worker for each independent task.** Its kickoff carries everything it needs, including each upstream report it depends on, pasted in full. Workers can't see their siblings. Run workers as their own shell session (`devin --cloud ""`; `run_subagent` has no cloud option) unless the work needs this machine: a `control-ui` or `control-cli` runtime check, local session transcripts, a simulator, or auth that exists only here. Cloud sessions load plugin skills but not plugin subagent profiles, so a cloud worker cannot spawn `pstack-*` or `pstack:poteto-agent` delegates. Keep cloud workers leaf-level and run anything that fans out locally. Pick each subagent's reasoning level and fast or standard speed for the job, per the Subagents section. - **A sub-coordinator only when one area has many parallel workers.** It owns that area's workers and kickoffs and sends you one rollup, never raw worker reports. Stop at three levels: you, sub-coordinators, and workers. Keep about ten workers in flight per coordinator, and start the next one as each finishes instead of waiting on a whole batch. - **Fork when new work needs a worker's built state,** such as its checkout, uncommitted changes, or a running process. Message a worker only for a follow-up on the same work. Never message one to check on it, because a message restarts an idle agent. - **Each PR gets a verifier that isn't its author,** on a different model family. The owner merges only on that verifier's pass at the current head. diff --git a/skills/poteto-mode/playbooks/shipping.md b/skills/poteto-mode/playbooks/shipping.md index 3e97417..e216784 100644 --- a/skills/poteto-mode/playbooks/shipping.md +++ b/skills/poteto-mode/playbooks/shipping.md @@ -2,7 +2,7 @@ **You own what lands. Verify each PR independently, land only the verified run from the root, then keep your hands off the stack.** -1. **Resolve the forge, then verify each PR independently before it lands.** GitHub CLI (`gh`) is the default. If `command -v origin` succeeds and Origin can resolve the repository, use `origin pr` for every PR operation. Otherwise stay on `gh` and record the fallback. Never require Graphite (`gt`). One verifier per PR, each a cloud Devin session (`devin --cloud -p ""`), runs the change the way a user would with the matching control skill (such as `control-ui` or `control-cli`), parent against head, and posts `PASS`, `PASS+NOTES`, or `FAIL` on that PR. Only a verdict from an agent that did not write the code counts, because an author checks what it meant to build. Green CI and an approving bot review are not verdicts, because neither runs the change as a user would. +1. **Resolve the forge, then verify each PR independently before it lands.** GitHub CLI (`gh`) is the default. If `command -v origin` succeeds and Origin can resolve the repository, use `origin pr` for every PR operation. Otherwise stay on `gh` and record the fallback. Never require Graphite (`gt`). One verifier per PR, each its own shell session (`devin --cloud ""`; `run_subagent` has no cloud option), runs the change the way a user would with the matching control skill (such as `control-ui` or `control-cli`), parent against head, and posts `PASS`, `PASS+NOTES`, or `FAIL` on that PR. Only a verdict from an agent that did not write the code counts, because an author checks what it meant to build. Green CI and an approving bot review are not verdicts, because neither runs the change as a user would. 2. **Land only the contiguous verified run rooted at the bottom.** Walk up from the lowest unmerged PR and stop at the first one without `PASS` or `PASS+NOTES`. The PRs below it are the run, and the top one is the ceiling. A verified PR above an unverified one waits, because it cannot land without the code below it. One whose branch neither holds nor needs that code can move onto trunk and land on its own. It needs a fresh verdict first, because its old one ran with that code beneath it and trunk does not have it. 3. **Re-check that the verdicts still describe the code.** A verdict covers a patch, and a chain rebase moves every PR above it to a new SHA without failing any check. Compare `git patch-id` at the verdict SHA with the current head before trusting an older verdict. When the patches differ only in tests, docs, or lint config, a lane's result stands if what it ran builds the same at both SHAs apart from noise. Noise is a difference that also shows up between two builds of the verdict SHA, or an embedded commit SHA. Report each kind of noise with its files, so a reader can check the call. The change itself still gets fresh checks and a review, because the old verdict never saw it. A lane with no build output, such as a dev server, cannot show this, so rerun it, and re-verify anything else that drifted. 4. **Land bottom-up, one PR at a time.** Always merge the run's lowest unmerged PR, with `origin pr merge ` or `gh pr merge --squash`. On Origin the plain command also merges every PR below the one you name, and on GitHub a PR whose base is still its parent's branch merges into that branch, not trunk. Read the PR back for the result (`origin pr view ` or `gh pr view --json state,mergedAt,baseRefName`), because a merge command can report success when a merge queue only queued the PR, and a requested auto-merge is not a merge. A landed PR reads merged with trunk as its base, not its parent's branch. Arm `--auto` (Origin merge-when-ready or GitHub auto-merge) only on a PR whose verdict covers its current head, because it lands whatever head is ready. After a merge lands, retarget the PR whose base was the merged branch to trunk (`origin pr edit --base ` or `gh pr edit --base `), move its patch onto the merge result, and push with `--force-with-lease`. The verdict covers the patch, not its commits, so step 3's patch-id rule decides whether the verdict survives. Merge it once its checks pass and its verdict survives. diff --git a/skills/setup-pstack/SKILL.md b/skills/setup-pstack/SKILL.md index 69d7d62..39ffc23 100644 --- a/skills/setup-pstack/SKILL.md +++ b/skills/setup-pstack/SKILL.md @@ -96,10 +96,7 @@ allowed-tools: - exec - web_search - webfetch - - mcp_list_servers - - mcp_list_tools - - mcp_call_tool - - mcp_read_resource + - mcp__* --- You are a read-only pstack subagent. Work the brief your parent passed. Report findings with file-and-line evidence. Do not edit files or run commands that mutate state. ``` diff --git a/skills/swarm/SKILL.md b/skills/swarm/SKILL.md index 7e8072e..04661d9 100644 --- a/skills/swarm/SKILL.md +++ b/skills/swarm/SKILL.md @@ -24,7 +24,7 @@ Open a todolist with one entry per phase before launching anything. ## Phase B: Fan out -Spawn all N workers in one `run_subagent` message with the step 3 `profile` and `is_background: true`. Workers that need an isolated VM — dependency installs, a running app, a browser — can instead run as cloud Devin sessions via `devin --cloud -p ""`, tracked through `devin list` and their session URLs. Keep a worker local only when it needs access to something on the user's computer. Cloud sessions load plugin skills but not plugin subagent profiles, so a cloud worker cannot spawn `pstack-*` or `pstack:poteto-agent` delegates — keep cloud workers leaf-level and run anything that fans out locally. +Spawn all N workers as their own shell sessions (`devin --cloud ""`; `run_subagent` has no cloud option), tracked through `devin list` and their session URLs. Use `run_subagent`, all N in one message, with the step 3 `profile` and `is_background: true`, only when the worker needs access to something on the user's computer. Cloud sessions load plugin skills but not plugin subagent profiles, so a cloud worker cannot spawn `pstack-*` or `pstack:poteto-agent` delegates — keep cloud workers leaf-level and run anything that fans out locally. When a worker must start from a non-default pushed branch, name the branch in its brief so the cloud session or worktree checks it out first. diff --git a/skills/why/SKILL.md b/skills/why/SKILL.md index 1db6e27..f3b8179 100644 --- a/skills/why/SKILL.md +++ b/skills/why/SKILL.md @@ -32,7 +32,7 @@ Before spawning investigators, build the seed context inline: file paths and lin ### Discovery -Before spawning investigators, list the available MCPs with `mcp_list_servers` and `mcp_list_tools`. +Before spawning investigators, list the available MCPs with `devin mcp list`. Map each available MCP to one evidence category: From 3a99eaa39b8200ea115f0ecc9c7fcd472aebfbcc Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 2 Nov 2026 03:05:13 +0000 Subject: [PATCH 2/3] drop the run_subagent note from the live-lane boot line The cloud command stays, and the note already lives in orchestrate and swarm. Co-authored-by: Kaitian Xie --- skills/poteto-mode/playbooks/multi-phase-plan.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skills/poteto-mode/playbooks/multi-phase-plan.md b/skills/poteto-mode/playbooks/multi-phase-plan.md index f414efd..43e7c2b 100644 --- a/skills/poteto-mode/playbooks/multi-phase-plan.md +++ b/skills/poteto-mode/playbooks/multi-phase-plan.md @@ -68,7 +68,7 @@ Tests alone are not sufficient verification. A PR is verified only when its unit ### Boot recipe, for every live lane -Each live lane runs on its own cloud VM (its own shell session, `devin --cloud ""`; `run_subagent` has no cloud option) or worktree at the PR head. Drive through `control-ui` or `control-cli`. +Each live lane runs on its own cloud VM (`devin --cloud ""` in its own shell session) or worktree at the PR head. Drive through `control-ui` or `control-cli`. - [ ] `git fetch origin && git checkout `. - [ ] From 462b7ccd46be9015766a4e0d9d3a6329588bc823 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 2 Nov 2026 03:15:27 +0000 Subject: [PATCH 3/3] pass cloud prompts after -- so they are not read as paths CLI 3000.11.228 treats a bare positional as a Desktop path. The prompt goes after --. Co-authored-by: Kaitian Xie --- docs/guide/02-poteto-mode.md | 2 +- skills/poteto-mode/playbooks/autopilot-full.md | 2 +- skills/poteto-mode/playbooks/multi-phase-plan.md | 2 +- skills/poteto-mode/playbooks/orchestrate.md | 2 +- skills/poteto-mode/playbooks/shipping.md | 2 +- skills/swarm/SKILL.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/guide/02-poteto-mode.md b/docs/guide/02-poteto-mode.md index 69f50fd..451d19d 100644 --- a/docs/guide/02-poteto-mode.md +++ b/docs/guide/02-poteto-mode.md @@ -104,7 +104,7 @@ A long chat accumulates context from the last task. When you change subjects, sa ## Give parallel work its own machine -If you run several agents against one repository on one computer, they will fight over the working tree, the ports, and the build output. The cleanest isolation is a [cloud Devin session](https://docs.devin.ai/cli/cloud) (`devin --cloud ""`). Each one gets its own VM and branch, so it can install dependencies, run your app, and record video of the result without touching your machine. Ask the parent chat to hand work to cloud sessions. +If you run several agents against one repository on one computer, they will fight over the working tree, the ports, and the build output. The cleanest isolation is a [cloud Devin session](https://docs.devin.ai/cli/cloud) (`devin --cloud -- ""`). Each one gets its own VM and branch, so it can install dependencies, run your app, and record video of the result without touching your machine. Ask the parent chat to hand work to cloud sessions. When the work has to stay local, ask for a worktree up front: diff --git a/skills/poteto-mode/playbooks/autopilot-full.md b/skills/poteto-mode/playbooks/autopilot-full.md index 562ec92..712f9f5 100644 --- a/skills/poteto-mode/playbooks/autopilot-full.md +++ b/skills/poteto-mode/playbooks/autopilot-full.md @@ -5,7 +5,7 @@ A verdict covers one patch and green CI covers one head. Step 4 runs a full swarm once, and again only for a major change. The patch-id rule in `playbooks/shipping.md` can carry a lane's result, and every new head needs its own green CI. 1. **The operator's gates come first.** The grant covers only the queue's items, so items the operator names as theirs and PRs outside the queue stop at merge-ready. A request to state the plan is not a go. -2. **Spawn one owner per PR, and keep its work where a replacement can find it.** Resolve the forge once for the program. GitHub CLI (`gh`) is the default. If `command -v origin` succeeds and Origin can resolve the repository, use `origin pr` for every PR operation. Otherwise stay on `gh` and record the fallback. Never require Graphite (`gt`). Each owner is its own shell session (`devin --cloud ""`; `run_subagent` has no cloud option) that builds, opens its PR per `playbooks/opening-a-pr.md`, proves the change on the real artifact, babysits to green per `playbooks/babysit.md`, and merges once steps 4 and 5 clear it. +2. **Spawn one owner per PR, and keep its work where a replacement can find it.** Resolve the forge once for the program. GitHub CLI (`gh`) is the default. If `command -v origin` succeeds and Origin can resolve the repository, use `origin pr` for every PR operation. Otherwise stay on `gh` and record the fallback. Never require Graphite (`gt`). Each owner is its own shell session (`devin --cloud -- ""`; `run_subagent` has no cloud option) that builds, opens its PR per `playbooks/opening-a-pr.md`, proves the change on the real artifact, babysits to green per `playbooks/babysit.md`, and merges once steps 4 and 5 clear it. Open the PR early so CI and bots run alongside the work. The code is ready only after the slop-strip (the `deslop` skill (`/pstack:deslop`)) and the `/pstack:no-comments` pass, so the full swarm runs on finished code. Then rebase onto current trunk and report the code-ready head before self-proof, so verification runs on the base the patch lands on. Report every later head, and merge-ready once self-proof, CI, and babysit are done. Fix rounds stay on that base unless trunk conflicts, breaks CI, or lands a known concurrent change to the same files, because each rebase restarts CI. Run the repo's checks for the touched paths on the committed head before the code-ready push and before a later push that needs a verifier. diff --git a/skills/poteto-mode/playbooks/multi-phase-plan.md b/skills/poteto-mode/playbooks/multi-phase-plan.md index 43e7c2b..29604ad 100644 --- a/skills/poteto-mode/playbooks/multi-phase-plan.md +++ b/skills/poteto-mode/playbooks/multi-phase-plan.md @@ -68,7 +68,7 @@ Tests alone are not sufficient verification. A PR is verified only when its unit ### Boot recipe, for every live lane -Each live lane runs on its own cloud VM (`devin --cloud ""` in its own shell session) or worktree at the PR head. Drive through `control-ui` or `control-cli`. +Each live lane runs on its own cloud VM (`devin --cloud -- ""` in its own shell session) or worktree at the PR head. Drive through `control-ui` or `control-cli`. - [ ] `git fetch origin && git checkout `. - [ ] diff --git a/skills/poteto-mode/playbooks/orchestrate.md b/skills/poteto-mode/playbooks/orchestrate.md index 7c20ff3..b2b3bd3 100644 --- a/skills/poteto-mode/playbooks/orchestrate.md +++ b/skills/poteto-mode/playbooks/orchestrate.md @@ -7,7 +7,7 @@ Run it with your own tools. Spawn on-machine workers with `run_subagent`. Keep t #### Topology - **One owner per PR.** The owner is the only writer of its branch and carries the PR from build to merge. Only the owner pushes, rebases, or retargets it. Closing or retargeting a base PR orphans every PR above it, so the owner does that only on your call. You never author or edit code. Conflicted merges, chain rebases, and fixes go to owners. -- **A fresh worker for each independent task.** Its kickoff carries everything it needs, including each upstream report it depends on, pasted in full. Workers can't see their siblings. Run workers as their own shell session (`devin --cloud ""`; `run_subagent` has no cloud option) unless the work needs this machine: a `control-ui` or `control-cli` runtime check, local session transcripts, a simulator, or auth that exists only here. Cloud sessions load plugin skills but not plugin subagent profiles, so a cloud worker cannot spawn `pstack-*` or `pstack:poteto-agent` delegates. Keep cloud workers leaf-level and run anything that fans out locally. Pick each subagent's reasoning level and fast or standard speed for the job, per the Subagents section. +- **A fresh worker for each independent task.** Its kickoff carries everything it needs, including each upstream report it depends on, pasted in full. Workers can't see their siblings. Run workers as their own shell session (`devin --cloud -- ""`; `run_subagent` has no cloud option) unless the work needs this machine: a `control-ui` or `control-cli` runtime check, local session transcripts, a simulator, or auth that exists only here. Cloud sessions load plugin skills but not plugin subagent profiles, so a cloud worker cannot spawn `pstack-*` or `pstack:poteto-agent` delegates. Keep cloud workers leaf-level and run anything that fans out locally. Pick each subagent's reasoning level and fast or standard speed for the job, per the Subagents section. - **A sub-coordinator only when one area has many parallel workers.** It owns that area's workers and kickoffs and sends you one rollup, never raw worker reports. Stop at three levels: you, sub-coordinators, and workers. Keep about ten workers in flight per coordinator, and start the next one as each finishes instead of waiting on a whole batch. - **Fork when new work needs a worker's built state,** such as its checkout, uncommitted changes, or a running process. Message a worker only for a follow-up on the same work. Never message one to check on it, because a message restarts an idle agent. - **Each PR gets a verifier that isn't its author,** on a different model family. The owner merges only on that verifier's pass at the current head. diff --git a/skills/poteto-mode/playbooks/shipping.md b/skills/poteto-mode/playbooks/shipping.md index e216784..fba830f 100644 --- a/skills/poteto-mode/playbooks/shipping.md +++ b/skills/poteto-mode/playbooks/shipping.md @@ -2,7 +2,7 @@ **You own what lands. Verify each PR independently, land only the verified run from the root, then keep your hands off the stack.** -1. **Resolve the forge, then verify each PR independently before it lands.** GitHub CLI (`gh`) is the default. If `command -v origin` succeeds and Origin can resolve the repository, use `origin pr` for every PR operation. Otherwise stay on `gh` and record the fallback. Never require Graphite (`gt`). One verifier per PR, each its own shell session (`devin --cloud ""`; `run_subagent` has no cloud option), runs the change the way a user would with the matching control skill (such as `control-ui` or `control-cli`), parent against head, and posts `PASS`, `PASS+NOTES`, or `FAIL` on that PR. Only a verdict from an agent that did not write the code counts, because an author checks what it meant to build. Green CI and an approving bot review are not verdicts, because neither runs the change as a user would. +1. **Resolve the forge, then verify each PR independently before it lands.** GitHub CLI (`gh`) is the default. If `command -v origin` succeeds and Origin can resolve the repository, use `origin pr` for every PR operation. Otherwise stay on `gh` and record the fallback. Never require Graphite (`gt`). One verifier per PR, each its own shell session (`devin --cloud -- ""`; `run_subagent` has no cloud option), runs the change the way a user would with the matching control skill (such as `control-ui` or `control-cli`), parent against head, and posts `PASS`, `PASS+NOTES`, or `FAIL` on that PR. Only a verdict from an agent that did not write the code counts, because an author checks what it meant to build. Green CI and an approving bot review are not verdicts, because neither runs the change as a user would. 2. **Land only the contiguous verified run rooted at the bottom.** Walk up from the lowest unmerged PR and stop at the first one without `PASS` or `PASS+NOTES`. The PRs below it are the run, and the top one is the ceiling. A verified PR above an unverified one waits, because it cannot land without the code below it. One whose branch neither holds nor needs that code can move onto trunk and land on its own. It needs a fresh verdict first, because its old one ran with that code beneath it and trunk does not have it. 3. **Re-check that the verdicts still describe the code.** A verdict covers a patch, and a chain rebase moves every PR above it to a new SHA without failing any check. Compare `git patch-id` at the verdict SHA with the current head before trusting an older verdict. When the patches differ only in tests, docs, or lint config, a lane's result stands if what it ran builds the same at both SHAs apart from noise. Noise is a difference that also shows up between two builds of the verdict SHA, or an embedded commit SHA. Report each kind of noise with its files, so a reader can check the call. The change itself still gets fresh checks and a review, because the old verdict never saw it. A lane with no build output, such as a dev server, cannot show this, so rerun it, and re-verify anything else that drifted. 4. **Land bottom-up, one PR at a time.** Always merge the run's lowest unmerged PR, with `origin pr merge ` or `gh pr merge --squash`. On Origin the plain command also merges every PR below the one you name, and on GitHub a PR whose base is still its parent's branch merges into that branch, not trunk. Read the PR back for the result (`origin pr view ` or `gh pr view --json state,mergedAt,baseRefName`), because a merge command can report success when a merge queue only queued the PR, and a requested auto-merge is not a merge. A landed PR reads merged with trunk as its base, not its parent's branch. Arm `--auto` (Origin merge-when-ready or GitHub auto-merge) only on a PR whose verdict covers its current head, because it lands whatever head is ready. After a merge lands, retarget the PR whose base was the merged branch to trunk (`origin pr edit --base ` or `gh pr edit --base `), move its patch onto the merge result, and push with `--force-with-lease`. The verdict covers the patch, not its commits, so step 3's patch-id rule decides whether the verdict survives. Merge it once its checks pass and its verdict survives. diff --git a/skills/swarm/SKILL.md b/skills/swarm/SKILL.md index 04661d9..db5fce2 100644 --- a/skills/swarm/SKILL.md +++ b/skills/swarm/SKILL.md @@ -24,7 +24,7 @@ Open a todolist with one entry per phase before launching anything. ## Phase B: Fan out -Spawn all N workers as their own shell sessions (`devin --cloud ""`; `run_subagent` has no cloud option), tracked through `devin list` and their session URLs. Use `run_subagent`, all N in one message, with the step 3 `profile` and `is_background: true`, only when the worker needs access to something on the user's computer. Cloud sessions load plugin skills but not plugin subagent profiles, so a cloud worker cannot spawn `pstack-*` or `pstack:poteto-agent` delegates — keep cloud workers leaf-level and run anything that fans out locally. +Spawn all N workers as their own shell sessions (`devin --cloud -- ""`; `run_subagent` has no cloud option), tracked through `devin list` and their session URLs. Use `run_subagent`, all N in one message, with the step 3 `profile` and `is_background: true`, only when the worker needs access to something on the user's computer. Cloud sessions load plugin skills but not plugin subagent profiles, so a cloud worker cannot spawn `pstack-*` or `pstack:poteto-agent` delegates — keep cloud workers leaf-level and run anything that fans out locally. When a worker must start from a non-default pushed branch, name the branch in its brief so the cloud session or worktree checks it out first.