pi-graphite 0.3.4 → 0.4.0

package/README.md

@@ -5,12 +5,15 @@ Opinionated pi tools + skill that wrap the [Graphite](https://graphite.com)
 
 ```
 graphite_status → (graphite_setup if needed) → graphite_sync → graphite_navigate
-       → graphite_change → graphite_submit_stack (dry-run) → graphite_submit_stack (apply)
+       → graphite_change → graphite_submit (dry-run) → graphite_submit (apply)
 ```
 
-The extension wraps `gt` only. It deliberately does **not** call `gh`, edit PR
-titles/bodies, fetch review comments, or perform stack surgery
-(split/fold/move/squash). Use the `gt` or `gh` CLI directly for those.
+The extension wraps `gt` only. It deliberately does **not** call `gh`, edit
+PR titles/bodies, fetch review comments, or perform stack surgery (split /
+fold / move / squash / reorder). For those flows, run the underlying `gt`
+or `gh` command yourself in your own terminal; the agent should not invoke
+them from bash, as their defaults open interactive prompts, hunk pickers,
+or editors that will hang non-interactive sessions.
 
 ## Requirements
 
@@ -45,7 +48,7 @@ agent loads it on demand.
 | `graphite_sync`          | Start-of-day / after-merge cleanup + restack                            | `gt sync`                                      |
 | `graphite_navigate`      | Move around the stack                                                   | `gt checkout`, `gt up`/`down`/`top`/`bottom`   |
 | `graphite_change`        | Create / amend a stacked branch                                         | `gt create -am`, `gt modify -am`, `gt modify --into`, `gt absorb` |
-| `graphite_submit_stack`  | Push the entire stack and open/update PRs (dry-run by default)          | `gt submit --stack --no-edit --no-ai`          |
+| `graphite_submit`  | Push the entire stack and open/update PRs (dry-run by default)          | `gt submit --stack --no-edit --no-ai`          |
 | `graphite_recover`       | Continue / abort / undo                                                 | `gt continue`, `gt abort`, `gt undo`           |
 
 ## Golden path
@@ -57,14 +60,14 @@ graphite_sync                                # at session start, or after merges
 graphite_navigate action=checkout branch=…   # move to the target PR / parent
 # user edits files
 graphite_change action=create message="…"     # or action=amend
-graphite_submit_stack apply=false             # review the dry-run plan
-graphite_submit_stack apply=true confirmRemote=true
+graphite_submit apply=false             # review the dry-run plan
+graphite_submit apply=true confirmRemote=true
 ```
 
 Conflict path:
 
 ```text
-# resolve files, git add them
+# resolve files, then: git add -- <paths>
 graphite_recover action=continue
 ```
 
@@ -83,7 +86,7 @@ dependent branches.
 - `graphite_setup action=track_branch` requires explicit `branch`, explicit
   `parent`, and `confirmParent:true`; do not guess parent if unclear.
 - `graphite_setup action=init_repo reset:true` needs `confirmDestructive:true`.
-- `graphite_submit_stack` defaults to `--dry-run`; `apply:true` also needs
+- `graphite_submit` defaults to `--dry-run`; `apply:true` also needs
   `confirmRemote:true`. `--force` push also requires `confirmRemote:true`.
 - `graphite_sync` with `force` or `deleteAll` needs `confirmDestructive:true`.
 - `graphite_recover action=continue` refuses to proceed if tracked files

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-graphite",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "description": "Opinionated pi tools + skill for stacked PR workflows with the Graphite (gt) CLI.",
   "keywords": [
     "pi",

package/skills/graphite/SKILL.md

@@ -42,7 +42,7 @@ The extension registers seven tools. Prefer them over `gt`/`git`/`gh` in bash.
 | `graphite_sync` | `gt sync` — pull trunk, drop merged branches, restack |
 | `graphite_navigate` | `gt checkout` / `up` / `down` / `top` / `bottom` / trunk |
 | `graphite_change` | `gt create` / `gt modify` / `gt modify --into` / `gt absorb` |
-| `graphite_submit_stack` | `gt submit --stack --no-edit` (dry-run by default) |
+| `graphite_submit` | `gt submit --stack --no-edit` (dry-run by default) |
 | `graphite_recover` | `gt continue` / `gt abort` / `gt undo` |
 
 All tools require an absolute `cwd`.
@@ -60,9 +60,9 @@ graphite_navigate                   (move to the branch you want to mutate)
      ↓
 graphite_change                     (create or amend)
      ↓
-graphite_submit_stack apply=false   (review dry-run plan)
+graphite_submit apply=false   (review dry-run plan)
      ↓
-graphite_submit_stack apply=true    (push, with confirmRemote=true)
+graphite_submit apply=true    (push, with confirmRemote=true)
    confirmRemote=true
 ```
 
@@ -129,9 +129,9 @@ graphite_status({ cwd })        # confirm state
 graphite_status({ cwd })                     # confirm position
 # ... user makes code changes ...
 graphite_change({ cwd, action: "create", message: "..." })
-graphite_submit_stack({ cwd, apply: false })
+graphite_submit({ cwd, apply: false })
 # review plan with user; then:
-graphite_submit_stack({ cwd, apply: true, confirmRemote: true })
+graphite_submit({ cwd, apply: true, confirmRemote: true })
 ```
 
 ### Update an existing PR
@@ -141,8 +141,8 @@ graphite_status({ cwd })
 graphite_navigate({ cwd, action: "checkout", branch: "<pr-branch>" })
 # ... user makes code changes ...
 graphite_change({ cwd, action: "amend", message: "..." })
-graphite_submit_stack({ cwd, apply: false })
-graphite_submit_stack({ cwd, apply: true, confirmRemote: true })
+graphite_submit({ cwd, apply: false })
+graphite_submit({ cwd, apply: true, confirmRemote: true })
 ```
 
 ### Add a child PR off a specific parent
@@ -151,7 +151,7 @@ graphite_submit_stack({ cwd, apply: true, confirmRemote: true })
 graphite_navigate({ cwd, action: "checkout", branch: "<parent-branch>" })
 # ... changes ...
 graphite_change({ cwd, action: "create", message: "..." })
-graphite_submit_stack({ cwd, apply: false })
+graphite_submit({ cwd, apply: false })
 ```
 
 ### Land changes into a downstack branch
@@ -160,7 +160,7 @@ graphite_submit_stack({ cwd, apply: false })
 # Make the change locally (working tree dirty).
 graphite_change({ cwd, action: "amend_into", into: "<downstack-branch>", message: "..." })
 graphite_status({ cwd })
-graphite_submit_stack({ cwd, apply: false })
+graphite_submit({ cwd, apply: false })
 ```
 
 For larger reshuffles touching several downstack commits, prefer `absorb`:
@@ -199,7 +199,7 @@ graphite_recover({ cwd, action: "undo" })
 
 ## Rules
 
-- **Submit stacks, not branches.** `graphite_submit_stack` always passes
+- **Submit stacks, not branches.** `graphite_submit` always passes
   `--stack`. There is no safe single-branch submit path in this extension.
   If the user truly needs to push only one branch, ask them to run
   `gt submit --branch=<name>` themselves in their own terminal — do not
@@ -213,7 +213,7 @@ graphite_recover({ cwd, action: "undo" })
 - **Prefer `graphite_sync` over manual restack.** The extension does not
   expose a standalone restack tool. Sync covers both pull + restack.
 - **Always dry-run first.** Show the user the dry-run plan from
-  `graphite_submit_stack apply=false` before pushing.
+  `graphite_submit apply=false` before pushing.
 - **`apply:true` requires `confirmRemote:true`.** The tool will refuse
   otherwise. This is intentional friction.
 - **Destructive sync flags require `confirmDestructive:true`** (`force`,

package/src/index.ts

@@ -5,7 +5,7 @@ import { registerSetup } from "./tools/setup";
 import { registerSync } from "./tools/sync";
 import { registerNavigate } from "./tools/navigate";
 import { registerChange } from "./tools/change";
-import { registerSubmitStack } from "./tools/submit";
+import { registerSubmit } from "./tools/submit";
 import { registerRecover } from "./tools/recover";
 
 /**
@@ -18,12 +18,12 @@ import { registerRecover } from "./tools/recover";
  *   graphite_sync          — start-of-day / after-merge cleanup + restack
  *   graphite_navigate      — move to the branch / PR you want to mutate
  *   graphite_change        — create or amend a stacked branch
- *   graphite_submit_stack  — push the whole stack and open/update PRs
+ *   graphite_submit  — push the whole stack and open/update PRs
  *   graphite_recover       — continue / abort / undo after conflicts or mistakes
  *
  * Golden path:
  *
- *   status → (setup if needed) → sync → navigate → change → submit_stack(dry-run) → submit_stack(apply)
+ *   status → (setup if needed) → sync → navigate → change → submit(dry-run) → submit(apply)
  *
  * Conflict path:
  *
@@ -34,7 +34,7 @@ import { registerRecover } from "./tools/recover";
  * - `gt` is invoked with --cwd <cwd> --no-interactive by default; tools that support AI metadata pass --no-ai.
  * - Editor / pager / browser env is forced safe; interactive editor / hunk /
  *   browser flows are not exposed.
- * - graphite_submit_stack defaults to --dry-run; apply requires
+ * - graphite_submit defaults to --dry-run; apply requires
  *   `apply:true` AND `confirmRemote:true`.
  * - graphite_sync with force / deleteAll requires `confirmDestructive:true`.
  * - This extension wraps `gt` only. It deliberately does not call `gh`,
@@ -47,6 +47,6 @@ export default function (pi: ExtensionAPI) {
   registerSync(pi);
   registerNavigate(pi);
   registerChange(pi);
-  registerSubmitStack(pi);
+  registerSubmit(pi);
   registerRecover(pi);
 }

package/src/tools/submit.ts

@@ -10,7 +10,7 @@ import {
 } from "../lib/schema";
 
 /**
- * graphite_submit_stack — the only blessed submit path.
+ * graphite_submit — the only blessed submit path.
  *
  * Wraps `gt submit --stack --no-edit --no-ai`. Defaults to --dry-run so the
  * caller can review the plan. Actually pushing requires `apply:true` AND
@@ -20,16 +20,16 @@ import {
  * current-branch-only submit. The skill calls out that the correct workflow
  * is always to submit the entire stack.
  */
-export function registerSubmitStack(pi: ExtensionAPI) {
+export function registerSubmit(pi: ExtensionAPI) {
   pi.registerTool({
-    name: "graphite_submit_stack",
+    name: "graphite_submit",
     label: "Graphite: submit stack",
     description:
       "Push the entire current stack and create/update PRs via `gt submit --stack --no-edit`. Defaults to a dry-run plan; pass apply:true with confirmRemote:true to actually push. PR title/body editing is intentionally not exposed.",
     promptSnippet:
-      "graphite_submit_stack: plan or apply `gt submit --stack` for the full stack",
+      "graphite_submit: plan or apply `gt submit --stack` for the full stack",
     promptGuidelines: [
-      "Always call graphite_submit_stack with apply:false (default) first to review the dry-run plan, then call again with apply:true and confirmRemote:true to actually push.",
+      "Always call graphite_submit with apply:false (default) first to review the dry-run plan, then call again with apply:true and confirmRemote:true to actually push.",
       "This extension does not edit PR titles/bodies. If you need to set them, do it outside this extension after the push.",
     ],
     parameters: Type.Object({