mirror of
https://github.com/garrytan/gstack.git
synced 2026-10-31 14:06:50 +01:00
* docs: Oct 7 follow-up wave plan (pre-review) * docs: Oct 7 follow-up wave plan, reviewed through /autoplan * docs: Oct 7 wave plan, record final gate decisions (UC1 accepted, UC2 rejected) * docs: credit #1822 to @Mike-E-Log and #1743 to @habassa5 (v1.64.0.0) The v1.64.0.0 CHANGELOG entry credited the extension token fix (#1822) and the polyfill exited promise (#1743) to the wrong handle, and the extension-sender-auth test header repeated the first slip. Commit history is not rewritten. Fixes #3054. Co-authored-by: Mike Ilog <48659643+Mike-E-Log@users.noreply.github.com> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(context-restore): offer newer checkpoints from nested repos and task worktrees /context-restore could present an older checkpoint as the latest with no error in two layouts: 1. A session started in a non-git parent saved from a nested repo, so the checkpoint went to the nested repo's bucket. Restore in the parent now lists checkpoints of other buckets whose project_root lies below the cwd (BELOW_CWD; the 200 newest are read, and from $HOME only each project's newest). /context-save also leaves a JSON pointer (checkpoint path, bucket, project_root) in the starting directory's bucket when $CLAUDE_PROJECT_DIR is set and files elsewhere; restore lists those as POINTER, in or out of git. 2. A plan checkpoint on the main tree's branch shadowed a newer checkpoint saved in a ticket worktree. When another branch holds a newer checkpoint for the same task (a worktree below the main tree, read from the new worktree: stamp; equal normalized titles; or a shared #123 / ABC-123 token in titles or branch names), restore prints NEWER_TASK and the skill shows both and proposes the newer one. Generic titles (wip, checkpoint, save, notes, todo) never match on title alone, and the worktree rule applies only when restoring from the main tree, so sibling worktrees still never shadow each other. The branch-first ordering itself is unchanged. Refs #3065. Co-authored-by: Thomas Gernhardt <t.gernhardt@softwareprojekt.net> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(redact-prepush): list each MEDIUM finding with rule, file line and fix The pre-push hook printed only a MEDIUM count, which nobody could review without re-running the engine by hand. It now prints one line per finding: rule id, file and file line, and a fix, never the matched value. Line numbers come from the hunk headers (combined --cc headers included), so a finding in a later hunk or past a scan-chunk boundary points at the real file line. Findings from the per-commit catch-up path name the commit whose file line it is, so content removed before the pushed tip is still locatable. Plan items: CEO-7 (summary half), DX-9 (fix lines), ENG-8 (line mapping). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(redact-prepush): stop flagging your own email and already-public authors (#3060) The hook never passed the engine's selfEmail / repoPublicEmails, so every push that added the pusher's address, or a commit author's, raised a MEDIUM pii.email warning for an address the destination already shows. The hook now reads `git config user.email` and one bounded `git log` of author and committer addresses, raw and mailmapped (%ae %aE %ce %cE): the history of every pushed tip (those commits become public with the push), each remote tip being replaced, and, for a new branch or an unknown remote tip pushed to a configured remote, that remote's own tracking refs. A URL or unknown destination never borrows tracking refs, and another remote's history never counts. The read stops at 50,000 commits (the newest authors are used) and 5 seconds. An error or the timeout passes no history and, when an email finding is listed, prints one line saying suppression was limited for this push. The two inputs fail independently. HIGH findings and every other rule are untouched. Controls: a stranger's address, an address only another remote knows, a URL push next to a matching remote, and a first push of a repo with no history all still report. Plan items: A3, CEO-7, CEO-23 (A3 half), DX-9 (partial history), ENG-8 (history scope, mailmap). Co-authored-by: akmandhania <143462686+akmandhania@users.noreply.github.com> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * feat(redact-prepush): per-address allowlist for pii.email (gstack.redact.allowEmail) `git config --add gstack.redact.allowEmail <address>` allows that address for MEDIUM pii.email findings only, so a team alias or support address that has to be in the repo stops warning without reaching for --no-verify. It never affects HIGH findings or any other rule, and the pii.email fix line names it. Controls: a different address still reports, and a HIGH secret next to an allowed address still blocks. Plan item: DX-17. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(troubleshooting): pre-push pii.email findings, exemptions and allowlist Plan item: DX-12 (pre-push touchpoint). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(redact-prepush): assemble fixture addresses at runtime The email fixtures were literals, so this branch's own push listed 47 pii.email findings in its test file. Build them from a helper instead, the way the neighbouring tests build credential and IP fixtures. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(browse): offer the user's signed-in tab, name silent aside repl failures Rules (rendered into every browsing skill, kept short): - Rule 1: before the first openTab, offer the user's tabs on the target origin (title and origin only; the rest of listBrowserTabs() stays private) and attach only after the user confirms one. - Rule 4: a second sign-in wall after a confirmed sign-in means the session is bound to the tab or URL; offer that tab instead of another sign-in. - Rule 6 no longer suggests an early return; rule 7 says a fast [ok without GSTACK_STEP_OK is an abort. Cookbook (browse, devex-review): a "Silent failures" list (evaluate returns only serializable values, no top-level return, locator(sel).press(key), an empty DOM read is about the selector until the screenshot and the request's response say otherwise, read toggle state before clicking) and a signed-in tab recipe that prints only target-origin tabs and never closes the user's tab. Parity caps for design-consultation, land-and-deploy, qa and the browse skeleton are raised to the measured sizes, with notes. Refs #3063, #3064. Co-authored-by: Thomas Gernhardt <t.gernhardt@softwareprojekt.net> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * feat(codex): run gstack-codex-probe as a command, one subcommand per probe Generated skills now execute bin/gstack-codex-probe (select-model, check-auth, show-sandbox, check-sandbox, probe-model, check-version, show-first-use-notice, run-with-timeout, log-event, log-hang, help) and capture its KEY: value lines, so no helper state crosses into the calling shell and the preflight works from bash, zsh or sh. select-model keeps --model > GSTACK_CODEX_MODEL > config.toml precedence; run-with-timeout supervises with the existing gtimeout/timeout/ watchdog chain and returns 124 on a deadline; an unknown subcommand exits 64. Sourcing keeps working for skills rendered before the upgrade and prints one deprecation line naming /gstack-upgrade; it and the zsh self-locate block are removed in a release on or after 2026-10-21 (DX-18). Parity caps raised with measured notes for the longer capture lines. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * feat(gstack-post): one argv-only, redaction-scanned write path for PR and issue text bin/gstack-post posts a PR/MR or issue comment, a review-comment reply, a PR title or body, a new PR/MR or a new issue from agent-written files. Every value reaches gh/glab as its own argv element in --flag=<value> form or on stdin, never through a shell string, and a target is a number or a URL of this repository on the same host. The helper owns the redaction scan: it reads each file once, scans those exact bytes (visibility from config, then gh/glab; the pusher's own email suppressed) and sends the same bytes. HIGH is refused with exit 1 and no confirmation can post it. MEDIUM exits 2 with RULE:/LINE:/PART: lines and a TOKEN: digest of the bytes, destination, operation and findings; only --confirm <token> for those exact bytes posts, so any edit needs a new confirmation. gh/glab failures exit 3, usage errors 64. It also carries the projectCards REST fallback and the title read-back that /ship did by hand. The logic lives in lib/gstack-post.ts behind an injectable runner, so its tests run in the Windows free lane; the stub-gh executable test is POSIX. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(autoplan): guard verifies dispatches on Claude Code 2.1.29x (schema strip, unflushed call, named causes) Cause A: Claude Code journals the model's raw Agent input but hands PreToolUse the schema-parsed input; with the fork-subagent gate on (the interactive default in 2.1.292) run_in_background is dropped, so the journal record never deep-equaled the payload. nativeToolInput now drops only that documented strip for Agent. Agent input is bound on both paths: keys limited to prompt, description, subagent_type (general-purpose) and run_in_background; a model override or any other key is denied. Cause B: when a ready journal lacks the current call, the guard evaluates the payload placed after the last journaled record instead of polling for a record that may arrive only with the tool result. A phase transition counts a report only when a later journaled record follows it (and, on the journal path, it is not in the current call's message). One batch rule covers both paths; a background reviewer keeps the invocation armed until its completion notice. Every outcome now has a stable reason code, disposition and anchor (autoplan/bin/guard-reasons.ts). UC1: Claude-Code-caused states (unrecognized shape, journal lag, rewritten journal, oversized record, unchecked-version schema strip) allow with a visible warning; integrity failures stay denials. No denial advises a bare retry. Every guarded decision appends one content-free line to analytics/autoplan-guard.jsonl, trimmed to 1,000 lines past 256 KiB. Co-authored-by: Jared <182125291+yolo-jared@users.noreply.github.com> Co-authored-by: crblabs <293123359+crblabs@users.noreply.github.com> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(autoplan): publish each phase report with a no-op call; foreground requests are conditional Phase-close step 6 sends the report in a message whose only tool call is the Bash no-op ': autoplan-published <phase>', and step 7 makes the next guarded call in a later message, so the guard sees the report flushed before the next phase entry regardless of Claude Code's journal timing. Every site that asked for run_in_background: false now asks for it only when the Agent schema offers it and says how to recover when a dispatch runs in the background anyway (wait for its completion notice). Parity caps rise by the measured bytes. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * feat(ship,spec,review): PR and issue text goes out only through gstack-post /ship: Step 18 writes the title into an agent-written file. An existing PR's title is piped from gh/glab through gstack-pr-title-rewrite.sh --stdin (new), so neither the agent nor a shell string carries it; a new title is written with the file tool and its version prefix checked in the file. Step 19 composes the body as before and publishes with gstack-post pr-create, or pr-body then pr-title, which scan the exact bytes they send. The separate title and body scans, the hand-rolled REST fallback and the title self-check are gone (the helper does all three). Title preparation moved into the pr-body section, so the skeleton shrinks. /spec files its issue with gstack-post issue-create and drops the pre-issue re-scan; Greptile replies use gstack-post reply and pr-comment. scripts/resolvers/redact-doc.ts loses its PR and issue sinks, and a test keeps any template from rendering one again. Tests that pinned the old scan-then-gh wiring now pin the gstack-post wiring; the publication tests run the real compose and publish blocks against a stub gh with the real helper (HIGH in title or body refused, MEDIUM token flow). Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * ci: pin Claude Code 2.1.292 in the CI image 2.1.292 is the npm latest users run. Its interactive default turns on the fork-subagent gate, which strips run_in_background from the Agent schema and backgrounds reviewers; CI on 2.1.284 never saw the /autoplan guard break. The image tag is a content hash, so every eval workflow picks up the new image without a workflow edit. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(brain-sync): one drain lock for every writer to the artifacts repo gstack-artifacts-init, gstack-brain-restore, gstack-gbrain-source-wireup and the skill-start merge ran git in $GSTACK_HOME without the drain's lock, so the drain could never tell an abandoned .git/index.lock from a live one. They now take the same mkdir lock (bin/gstack-brain-lock.sh): the drain and the skill-start merge skip when it is held, user-run writers wait for it (GSTACK_BRAIN_LOCK_WAIT, default 120 s), and a child of the holder (the drain's daily worktree advance, restore's wireup) inherits it by token. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(brain-sync): hold back only the flagged file, keep coupled artifacts whole One file with secret-shaped text used to block every push, silently. The drain now attributes scanner hits to files in one pass over the staged diff (split on its diff --git headers), holds back each flagged file with the rest of its coupled group, unstages it, and requires the remaining staged diff to re-scan clean; anything short of that falls back to a full unstage and status blocked. Held files stay queued and are re-scanned every drain. - Status file gains held_count, drainable, last_drain_at, last_push_at and held[] (path, scanner rule, dependents, both fixes); new status held. - Coupled groups come from an explicit map (decisions.jsonl and decisions.active.json): a queued member stages the whole group, a group stages only when its snapshot matches its log in the index, a skipped member stops the whole group. - --unskip-file undoes --skip-file and queues the path again. - An index lock older than 10 minutes is removed under the drain lock; a younger one, a failed git add, a failed commit (hooks included) keep the queue and report status error. A verified empty staged diff is the only "nothing to commit". git add runs once, batched. - The scanner reads bytes, so undecodable content no longer crashes it into a false clean; matched text never reaches the status file. - An empty-queue run with unpushed sync commits stays push_failed. - Privacy-held duplicate records collapse to one per path; --status counts a spool too deep for a shell glob. - --attention prints skill start's fixed attention lines from the sync status table in the usage header. Co-authored-by: v639dragoon <matthewsbrickley@gmail.com> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * feat(skill-start): ARTIFACTS_SYNC attention lines for a stuck sync Skill start now prints one fixed attention line per sync-status-table row that applies (held, blocked, push_failed, error, unknown, stale-push, stale-drain), each naming gstack-brain-sync by absolute path. Values from the status file are clamped (status code to the table, counts to digits, timestamps to their shape), so the status message, file paths and scanner output never reach the line. The preamble tells the model to surface the line in one sentence and continue. Skill-start tests are generated from the table in bin/gstack-brain-sync, and docs/gbrain-sync-errors.md carries the same table. Co-authored-by: v639dragoon <matthewsbrickley@gmail.com> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(outside-review): severity words in label position count as findings The Oct 7 /autoplan run's Codex CEO and DX reviews labeled seven and eight findings High/Medium without [Pn] tags, and the classifier printed VERDICT: clean / FINDINGS: none for both. lib/outside-review-result.ts now reads severity words in label position (Severity: High, a leading High: / High — / [High], **High**, a table cell): critical/high block like P0/P1, medium/low are advisory. Words in prose (high-level, low-risk, no critical findings) never count. A review or structured response with neither tags, labels nor an explicit no-findings statement is unverified, never clean (DX-11, ENG-10). Design-direction proposals move to a new proposal gate so they keep needing only their Recommendation line, and review prompts ask for a severity per finding. Fixtures reproduce the CEO/DX label shapes, the eng [P1] output, a table and prose negative controls; the stored Codex panel keeps its verdicts. docs/troubleshooting.md explains how the verdict is read. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * feat: gstack-doctor readiness report and setup --status Codex row (B5) bin/gstack-doctor prints one row per check without starting a skill: install root (the registry rows behind ./setup --status), state root, Bun against the floor, hook parse check, Codex mode and self-locate via gstack-codex-probe subcommands, the cached model probe with its age (--live runs the paid probe-model), artifacts-sync health from the status file with the status code clamped, the browse bundle, Claude Code version, the largest session journal and the last five schema-1 guard reason codes. Rows are ok, warn, not configured or fail; only fail exits non-zero; fix lines name helpers by absolute install-root path. ./setup --status gains a read-only Codex row (bin/gstack-codex-status.sh, shared with the doctor) and ends with the doctor's absolute path. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs: bug-report template asks for doctor output; README troubleshooting entry; doctor test in the Windows lane The template gives the Claude Code doctor path and a lookup for other hosts and names no bare gstack- command (asserted in test/gstack-doctor.test.ts). The doctor test runs every script through explicit bash argv, so it joins the curated Windows free subset. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * docs(troubleshooting): readiness check section points at gstack-doctor Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(question-tuning,plan-tune,gbrain): free text reaches helpers only through agent-written files Question tuning no longer pipes the question summary through printf: a registered id needs no summary, and for an unregistered id the agent writes the summary to .gstack/tmp/qt.txt and passes --summary-file (new). The helper resolves a relative path against the git top level, removes scratch files under .gstack/tmp, and asks normally when the file is missing. /plan-tune tune events carry the user's own words again: they go into a file the agent writes and reach gstack-question-preference --write through --free-text-file (new), still behind the injection filter and the user-origin gate. docs/gbrain-write-surfaces.md drops its heredoc templates for the agent-written page file on stdin, matching the per-skill save block, and the generic save block stops showing a quoted --content argument. The tuning prose was tightened so every preamble stays within its size cap. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(evals): daily autoplan-schema-canary on the latest Claude Code A periodic rule case installs the latest published Claude Code with install scripts off, verifies registry signatures, and runs one headless session with the fork-subagent gate on whose PreToolUse hook records an Agent and a Read payload. Each payload must match its journal record under the guard's own comparison, keep the journal's key set apart from the documented run_in_background strip, and stay inside the Agent allowlist; a background Agent's completion notice must keep the shape the guard reads. evals-periodic.yml runs it daily on its own schedule and concurrency group (read-only token); the weekly census also includes it. A free test proves the comparison fails on an injected strip. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(doctor): read the artifacts sync held count from held_count, the field the drain writes * fix(artifacts sync): the init and restore pre-commit hooks catch Bearer/Basic/Token-prefixed JSON auth headers like the drain does * feat(greptile-early): detect Greptile, ask once on public repos, open the early draft, wait for the review bin/gstack-greptile-early backs /ship's early Greptile PR: - detect: a root .greptile/ folder (which takes precedence), greptile.json, or a Greptile comment on the repo in the last 90 days; triggerOnDrafts from the effective root config; repo visibility; public-repo consent. It prints the signal, that /ship will push and open a draft now, the 10-minute wait cap and the absolute gstack-config command that turns it off. - consent yes|no: the public-repo answer, remembered per repo in the project's state. - open: opens the draft through gstack-post with a body saying /ship opened it early, and posts one @greptileai comment through gstack-post when the config does not set triggerOnDrafts: true. An open PR is left alone. - wait: polls every 30 s for a completed Greptile check run, a Greptile review of the head commit or a summary naming it; each call returns within about 90 s and reports timeout 10 minutes after the PR opened. gstack-config gains ship_greptile_early (default true, invalid values rejected): on automatically whenever the repo uses Greptile, off per user. The logic is in lib/greptile-early.ts behind an injectable runner, so its fixture-repo tests run in the Windows lane; an end-to-end test drives the real helper and gstack-post against a stub gh. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * feat(ship): early Greptile PR at Step 6.5, bounded wait at Step 10 (#3020) When the repo uses Greptile, /ship pushes and opens a draft PR right after its free tests pass (new lazy section greptile-early, Step 6.5), so Greptile reviews while Steps 7-9 run. A public repo asks once, remembered per repo; declining keeps today's order. Step 10 waits for that review with gstack-greptile-early wait and takes the existing unavailable route on a timeout, never a claim of zero comments. Step 18 replaces the provisional title, Step 19 marks the draft ready unless a draft was requested, and a /ship that stops after Step 6.5 leaves the draft open with one comment saying why. ship's union cap rises to 1.5275 with the measured note (B4 +836 bytes, B2 +4,732 bytes); the step-numbering guard allows 6.5; ship goldens are refreshed for B4 and B2. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(autoplan): the publication no-op is 'true autoplan-published <phase>' Measured on Claude Code 2.1.292 in a default-settings interactive session: a bare ':' Bash command asks for approval ('This command requires approval'), and after a background reviewer's completion notice starts a new turn the skill's allowed tools no longer cover it, so the phase-close no-op prompted the user. 'true' with arguments runs without approval and prints nothing. The guard only needs a later journaled record, so the command changes everywhere it is named. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(evals): live autoplan-guard-pty case on the pinned Claude Code A gate-tier rule case (one trial, haiku) drives an interactive PTY session with default settings through a project skill that carries /autoplan's own hook block: init, Phase 1 entry, a CEO reviewer dispatch that sends run_in_background, a prepared close packet, the report published with the no-op, and the Phase 2 entry in a later message. It reads outcomes from the guard decision log (three verified allows) and fails if the no-op raises a permission card; other cards are approved and printed. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * fix(autoplan): bounded, append-tolerant owned-journal read (A2) The publication guard no longer reads the whole parent journal or refuses it at 32 MiB. lib/claude-owned-journal.ts streams the bytes present at open to the last complete line (pass one), keeps a content-free index per record and decides ownership, ancestry and causal order on it with the same checks and reason codes as before. Pass two reloads in full only what the evaluation reads (autoplan/bin/guard-journal.ts): every literal init and its result, the current call, and inside the invocation window (from the latest human turn at or before the bound chain's first init) guarded and close-packet Read results, structured Bash results, error results, assistant text after the first close Read and active-plan mutations, plus the earlier Read a dedup reply cites even before the window (ENG-4). - lib/claude-journal-records.ts: per-record event extraction, record metadata and the causal-order checks, shared by readPlanCountTranscript and the bounded reader. The batch reader keeps its whole-file read and cap. - Appends after open never fail a read; same device and inode and no shrink are required (identity). A second read in one hook invocation must hash bytes [0, first size) the same, or it is `rewritten` (UC1 unverified); the unrecognized-shape double read uses that prefix hash. `changing` is removed (REMOVED_CODES; its anchor stays). - OWNED_RECORD_MAX_BYTES (32 MiB): only one record over it is too_large. OWNED_RETAINED_MAX_BYTES (32 MiB): over it is the new oversized_invocation fallback denial. GSTACK_TRANSCRIPT_TEST_MAX_BYTES and GSTACK_TRANSCRIPT_TEST_RETAINED_BYTES can only lower them. - ENG-5: evaluation groups uses and results by tool id once (no per-tool rescans). CEO-25 / ENG-5 spike (120 MiB synthetic, 31,242 records, 4 vCPU Linux, Bun 1.4.2): a full streaming rescan (parse every line, small index, sha256) took 254-326 ms at 147-161 MiB peak RSS; a pass-one index cache under the state root (load cached index, verify a 64 KiB tail hash, parse the tail) took 26-29 ms at 47 MiB. The rescan meets the 1 s budget, so the cache is not adopted: it would add trusted persistent state and invalidation for no budget need. A backward tail read cannot prove competing_root or cycle, so it was not a candidate. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(autoplan): journal-read benchmark and its dispatch-only workflow (CEO-2, CEO-6) scripts/measure-journal-read.ts builds two synthetic 120 MiB parent journals around a real /autoplan invocation (mixed: ~28k records, most bytes inside the invocation; large-invocation: ~89k records with a current invocation of many small records), keeps appending while the guard reads, and measures one hook call in a fresh process (wall ms, peak RSS). The workflow runs it on ubuntu-latest and macos-latest on workflow_dispatch only. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * test(evals): autoplan-long-session, a resumed >100 MiB session enters Phase 1 CEO-15 with ENG-6's observer: a real session is compacted, its journal padded past 100 MiB with owned records before the compact boundary, and the resumed interactive session runs the scripted phase boundary; the guard decision log must show a verified Phase 1 allow. A free test proves that observer on a padded journal through the lower-only bound seams (the PTY counting reader refuses the same journal), with a sidechain control that must deny. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * v1.91.34.0: CHANGELOG, TODOS, version; harness decision for test-pr-profile; ship title-step test reads its new section * docs(changelog): use an example.com address in the allowEmail example * test: assemble GitHub-token fixtures at runtime in the new brain-sync and skill-start tests (CI credential scan) * fix: integration repairs across the wave (Step 6.5 fence, printed helper paths on Windows, probe usage without a heredoc) and tests pinned to the moved title and gstack-post contracts * test(doctor): the healthy fixture builds browse.exe on Windows, the name setup uses there * test(shared-libs): recognize Claude Code 2.1.292's internal git probe prefix (format.pretty and per-hook disables), with its CI receipt * fix(ship-measure): report lists v1 measurements as an older format instead of crashing --------- Co-authored-by: Mike Ilog <48659643+Mike-E-Log@users.noreply.github.com> Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> Co-authored-by: Thomas Gernhardt <t.gernhardt@softwareprojekt.net> Co-authored-by: akmandhania <143462686+akmandhania@users.noreply.github.com> Co-authored-by: Jared <182125291+yolo-jared@users.noreply.github.com> Co-authored-by: crblabs <293123359+crblabs@users.noreply.github.com> Co-authored-by: v639dragoon <matthewsbrickley@gmail.com>
878 lines
42 KiB
Bash
Executable File
878 lines
42 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# gstack-slug — output project slug and sanitized branch name
|
|
# Usage: eval "$(gstack-slug)" → sets SLUG and BRANCH variables
|
|
# Or: gstack-slug → prints SLUG=... and BRANCH=... lines
|
|
# gstack-slug --get NAME → print one raw value (SLUG, BRANCH or an
|
|
# --identity field); skill bash blocks
|
|
# use this form (#2763: worktree-isolated Claude
|
|
# Code sessions refuse eval/source)
|
|
# Modes (not on the hot path; see `gstack-slug --help`):
|
|
# --identity also print PROJECT_REMOTE, PROJECT_ROOT, LEGACY_SLUG
|
|
# --stamp-checkpoint <file> write remote:/project_root: into a checkpoint's frontmatter
|
|
# --classify-checkpoints read checkpoint paths on stdin, print "<status>\t<path>"
|
|
# --checkpoints-below list other buckets' checkpoints saved below the cwd, plus pointers
|
|
# --point-from <dir> <file> leave a pointer to <file> in <dir>'s bucket (nested-repo saves)
|
|
# --newer-task <branch> read restore candidates on stdin, name a newer same-task checkpoint
|
|
# --adopt-legacy [--copy <relpath>...] review/copy files from the pre-#3003 bucket
|
|
# --adopt-legacy --from <slug> merge a former bucket (e.g. a worktree's) into this one
|
|
# --adopt-legacy --dismiss <slug> stop naming a former bucket at skill start
|
|
#
|
|
# Nested-group remotes (#3003): a hosted remote with 3+ path segments
|
|
# (gitlab.com/a/product/repo) files under "<last-two>-<16 hex>" instead of the
|
|
# last two segments alone, so projects in different groups stop sharing one
|
|
# bucket. 2-segment remotes (all of GitHub) and local paths are unchanged. The
|
|
# canonical-remote and slug rules live in bin/gstack-remote-identity.sh (twin of
|
|
# lib/remote-identity.ts). Earlier data stays in the old bucket until the user
|
|
# copies it with --adopt-legacy; nothing moves automatically. ssh host aliases
|
|
# (git@work-gitlab:…) are a different canonical host than the https spelling;
|
|
# pin those with GSTACK_PROJECT_SLUG.
|
|
#
|
|
# Cache key (#2767): inside a git repository the entry is keyed on the git
|
|
# common dir, which the main checkout, its subdirectories and every linked
|
|
# worktree share, so a worktree can no longer resolve a different slug than
|
|
# the main checkout. It is read from .git files without spawning git. Entries
|
|
# written before this keyed on pwd; on a miss the main checkout's old entry
|
|
# wins over the current directory's own old entry (deterministic: the main
|
|
# checkout holds the project's original, possibly pre-remote, identity). When
|
|
# a worktree's own old entry named a different, non-empty bucket, that slug is
|
|
# recorded in projects/<slug>/.former-slugs until --adopt-legacy --from merges
|
|
# it or --dismiss drops it. Both keys are written, so pwd-keyed readers agree.
|
|
#
|
|
# Cache format: entries are versioned ("v2:<slug>"). An unversioned entry from
|
|
# an older gstack is recomputed once (one git spawn) and rewritten as v2; it
|
|
# keeps its value unless it is exactly the pre-#3003 last-two slug of a
|
|
# 3+-segment remote, so #2212 sticky identity survives the upgrade and later
|
|
# cache hits stay git-free.
|
|
#
|
|
# Resolution order (highest precedence first):
|
|
# 0. $GSTACK_PROJECT_SLUG env override (documented escape hatch)
|
|
# 1. Walk UP from $(pwd) to the OUTERMOST ancestor containing a canonical
|
|
# project-identity marker (.git, .project.yaml, package.json, pyproject.toml,
|
|
# Cargo.toml, Gemfile, go.mod). Use that ancestor as the "project root".
|
|
# Build/deploy artifacts (.vercel, .next, dist, node_modules, etc.) are
|
|
# DELIBERATELY NOT markers — they're tooling output, not project identity.
|
|
# Without this walk-up, running gstack-slug from a subdir whose only
|
|
# "marker" is a deploy artifact silently resolves to the subdir's basename,
|
|
# misfiling all session state under a phantom slug. (2026-05-25 bug fix.)
|
|
# 2. Derive the slug from the canonical git remote: the OUTERMOST ancestor
|
|
# that is an actual git repo (`.git` directory, or `.git` FILE for
|
|
# worktrees/submodules) with an `origin` remote wins. The slug is
|
|
# `owner-repo`, parsed EXACTLY like browse/bin/remote-slug so the two
|
|
# bins can never disagree on a canonical-remote repo. Marker-only
|
|
# ancestors that are NOT remote-bearing repos (a stray empty ~/.git,
|
|
# a stray package.json in $HOME) still anchor the basename FALLBACK,
|
|
# but they can no longer shadow a real remote. (2026-08-17 bug fix:
|
|
# a stray empty ~/.git made the walk-up pick $HOME as project root;
|
|
# $HOME has no origin, so EVERY repo under it degraded to
|
|
# SLUG=<username> — one shared bucket for all projects.)
|
|
# 3. Otherwise use the basename of the resolved project root.
|
|
# 4. If no project root was found anywhere on the chain, fall back to the
|
|
# basename of $(pwd) (preserves prior behavior for plain folders).
|
|
#
|
|
# MIGRATION NOTE (2026-08-17): sessions run BEFORE the remote-first fix above,
|
|
# in repos below a stray marker-bearing ancestor, filed their session state
|
|
# (decisions / timeline / ceo-plans / learnings) under the DEGRADED slug —
|
|
# ~/.gstack/projects/<ancestor-basename>/ (e.g. `garrytan`) instead of the
|
|
# canonical ~/.gstack/projects/<owner-repo>/. The slug cache self-heals on the
|
|
# next invocation (see 1b), but already-written store data does NOT move.
|
|
# Whether/how to merge those stores is tracked in TODOS.md — do not add data
|
|
# migration code here.
|
|
#
|
|
# Caching is self-healing: a cache entry for the literal pwd that differs from
|
|
# the freshly-computed slug gets opportunistically rewritten (single-shot, key-
|
|
# local — never sweeps other entries). This lets pre-existing poisoned caches
|
|
# clean themselves up without a manual `rm -rf ~/.gstack/slug-cache/`.
|
|
#
|
|
# Security: output is sanitized to [a-zA-Z0-9._-] only, preventing shell
|
|
# injection when consumed via source or eval.
|
|
# Bash 5.2+ can feed a heredoc body >=512B through a pipe with no reader
|
|
# yet, which hangs --help forever; compat level 50 restores the tempfile path
|
|
# (same guard as bin/gstack-artifacts-init). Not exported.
|
|
BASH_COMPAT=50
|
|
|
|
set -euo pipefail
|
|
|
|
# State-root aware (bin/gstack-state-root.sh), matching lib/bin-context.ts (#2561): the
|
|
# bash writer and the TS reader must key the SAME cache, and a test running
|
|
# with GSTACK_HOME=<temp> must write its cache junk there, not into the real
|
|
# home (observed: 2,528 stale temp-cwd entries accumulated in ~/.gstack).
|
|
. "$(dirname "$0")/gstack-state-root.sh" 2>/dev/null || { echo "$0: cannot resolve the gstack state root: $(dirname "$0")/gstack-state-root.sh is missing. fix: reinstall with ./setup or /gstack-upgrade (docs/state-root.md)" >&2; exit 1; }
|
|
gstack_state_root_select; GSTACK_STATE_ROOT="$_gstack_sr_root"
|
|
. "$(dirname "$0")/gstack-remote-identity.sh" 2>/dev/null || { echo "$0: $(dirname "$0")/gstack-remote-identity.sh is missing. fix: reinstall with ./setup or /gstack-upgrade" >&2; exit 1; }
|
|
|
|
MODE=default
|
|
MODE_ARG=""
|
|
MODE_ARG2=""
|
|
COPY_PATHS=()
|
|
case "${1:-}" in
|
|
"") ;;
|
|
--identity) MODE=identity ;;
|
|
--get) MODE=get; MODE_ARG="${2:-}"
|
|
case "$MODE_ARG" in SLUG|BRANCH|PROJECT_REMOTE|PROJECT_ROOT|LEGACY_SLUG|FORMER_SLUGS) ;;
|
|
*) echo "usage: gstack-slug --get SLUG|BRANCH|PROJECT_REMOTE|PROJECT_ROOT|LEGACY_SLUG|FORMER_SLUGS" >&2; exit 2 ;;
|
|
esac ;;
|
|
--stamp-checkpoint) MODE=stamp; MODE_ARG="${2:-}"
|
|
[[ -n "$MODE_ARG" ]] || { echo "usage: gstack-slug --stamp-checkpoint <file>" >&2; exit 2; } ;;
|
|
--classify-checkpoints) MODE=classify ;;
|
|
--checkpoints-below) MODE=below ;;
|
|
--newer-task) MODE=newer-task; MODE_ARG="${2:-}" ;;
|
|
--point-from) MODE=point; MODE_ARG="${2:-}"; MODE_ARG2="${3:-}"
|
|
[[ -n "$MODE_ARG" && -n "$MODE_ARG2" ]] || { echo "usage: gstack-slug --point-from <start dir> <checkpoint file>" >&2; exit 2; } ;;
|
|
--adopt-legacy) MODE=adopt; shift
|
|
if [[ "${1:-}" == "--copy" ]]; then
|
|
shift
|
|
[[ $# -gt 0 ]] || { echo "usage: gstack-slug --adopt-legacy --copy <relpath>..." >&2; exit 2; }
|
|
COPY_PATHS=("$@")
|
|
elif [[ "${1:-}" == "--from" || "${1:-}" == "--dismiss" ]]; then
|
|
MODE=$([[ "$1" == "--from" ]] && echo adopt-from || echo adopt-dismiss)
|
|
MODE_ARG=$(printf '%s' "${2:-}" | tr -cd 'a-zA-Z0-9._-')
|
|
case "$MODE_ARG" in ""|.|..) echo "usage: gstack-slug --adopt-legacy $1 <slug>" >&2; exit 2 ;; esac
|
|
elif [[ -n "${1:-}" ]]; then
|
|
echo "usage: gstack-slug --adopt-legacy [--copy <relpath>... | --from <slug> | --dismiss <slug>]" >&2; exit 2
|
|
fi ;;
|
|
-h|--help)
|
|
cat <<'USAGE'
|
|
gstack-slug — print SLUG=<project slug> and BRANCH=<branch> for the current directory.
|
|
eval "$(gstack-slug)" set SLUG and BRANCH
|
|
SLUG=$(gstack-slug --get SLUG) print one raw value (SLUG, BRANCH, or an --identity
|
|
field); no eval needed
|
|
gstack-slug --identity also print PROJECT_REMOTE (canonical, credential-free),
|
|
PROJECT_ROOT and LEGACY_SLUG (pre-#3003 bucket, if different)
|
|
gstack-slug --stamp-checkpoint FILE write remote:/project_root: into FILE's frontmatter
|
|
gstack-slug --classify-checkpoints read checkpoint paths on stdin; print "<status><TAB><path>",
|
|
status = match | match-root | foreign | unstamped
|
|
gstack-slug --checkpoints-below outside git: other buckets' checkpoints whose project_root
|
|
is below the cwd (newest 200 read); always: this bucket's
|
|
pointers. Prints "BELOW_CWD <path>" / "POINTER <path>"
|
|
gstack-slug --point-from DIR FILE record FILE in DIR's bucket when DIR files elsewhere
|
|
gstack-slug --newer-task BRANCH read restore candidates on stdin (BRANCH's first); print
|
|
"NEWER_TASK <path>" for a newer same-task other-branch save
|
|
gstack-slug --adopt-legacy list the old bucket's files (checkpoints marked
|
|
matching/foreign/unknown); asks per file on a terminal
|
|
gstack-slug --adopt-legacy --copy P… copy the named files (paths relative to the old bucket)
|
|
gstack-slug --adopt-legacy --from S merge bucket S into this project's: JSONL logs merge with
|
|
de-duplication, missing files copy, differing files are
|
|
listed as conflicts and never overwritten; S is kept
|
|
gstack-slug --adopt-legacy --dismiss S stop naming former bucket S at skill start
|
|
Env: GSTACK_PROJECT_SLUG pins the slug (ssh host aliases, vendored sub-repos); never cached.
|
|
USAGE
|
|
exit 0 ;;
|
|
*) echo "gstack-slug: unknown argument: $1 (try --help)" >&2; exit 2 ;;
|
|
esac
|
|
CACHE_DIR="$GSTACK_STATE_ROOT/slug-cache"
|
|
PROJECT_DIR="$(pwd)"
|
|
# Encode absolute path as cache key: /Users/j/foo → _Users_j_foo
|
|
CACHE_KEY=$(printf '%s' "$PROJECT_DIR" | tr '/' '_')
|
|
CACHE_FILE="${CACHE_DIR}/${CACHE_KEY}"
|
|
|
|
# Physical git common dir of the repository holding $1 (nearest .git entry),
|
|
# or nothing outside git. A worktree's .git file names its gitdir, whose
|
|
# `commondir` file points at the shared dir. No git spawn.
|
|
_git_common_dir() {
|
|
local dir="$1" parent="" gitdir="" common="" depth=0
|
|
while [[ -n "$dir" && $depth -lt 64 ]]; do
|
|
if [[ -d "$dir/.git" ]]; then (cd "$dir/.git" 2>/dev/null && pwd -P); return 0; fi
|
|
if [[ -f "$dir/.git" ]]; then
|
|
gitdir=$(sed -n 's/^gitdir: *//p' "$dir/.git" 2>/dev/null | head -1)
|
|
[[ -n "$gitdir" ]] || return 0
|
|
[[ "$gitdir" == /* || "$gitdir" =~ ^[A-Za-z]: ]] || gitdir="$dir/$gitdir"
|
|
common="$gitdir"
|
|
if [[ -f "$gitdir/commondir" ]]; then
|
|
common=$(head -1 "$gitdir/commondir" 2>/dev/null)
|
|
[[ "$common" == /* || "$common" =~ ^[A-Za-z]: ]] || common="$gitdir/$common"
|
|
fi
|
|
(cd "$common" 2>/dev/null && pwd -P); return 0
|
|
fi
|
|
parent=$(dirname "$dir")
|
|
[[ "$parent" == "$dir" ]] && break
|
|
dir="$parent"
|
|
depth=$((depth + 1))
|
|
done
|
|
return 0
|
|
}
|
|
LEGACY_CACHE_FILE="$CACHE_FILE"
|
|
MAIN_CACHE_FILE=""
|
|
GIT_COMMON_DIR=$(_git_common_dir "$PROJECT_DIR")
|
|
if [[ -n "$GIT_COMMON_DIR" ]]; then
|
|
CACHE_FILE="${CACHE_DIR}/$(printf '%s' "$GIT_COMMON_DIR" | tr '/' '_')"
|
|
if [[ "$(basename "$GIT_COMMON_DIR")" == .git ]]; then
|
|
MAIN_CACHE_FILE="${CACHE_DIR}/$(dirname "$GIT_COMMON_DIR" | tr '/' '_')"
|
|
fi
|
|
fi
|
|
|
|
SLUG=""
|
|
|
|
# 0. Explicit env override — wins over everything. Escape hatch for vendored
|
|
# sub-repos and other genuine "subdir IS its own project" edge cases.
|
|
SLUG_FROM_ENV=0
|
|
if [[ -n "${GSTACK_PROJECT_SLUG:-}" ]]; then
|
|
SLUG=$(printf '%s' "$GSTACK_PROJECT_SLUG" | tr -cd 'a-zA-Z0-9._-')
|
|
# A pin of "." or ".." would file state outside projects/; ignore it.
|
|
case "$SLUG" in .|..) SLUG="" ;; esac
|
|
# Per-invocation escape hatch, never a durable identity: persisting it
|
|
# would rebind THIS cwd's slug for every later env-less run (observed: a
|
|
# test exporting GSTACK_PROJECT_SLUG from the repo root rebound the whole
|
|
# repo's session state to the test's slug).
|
|
SLUG_FROM_ENV=1
|
|
fi
|
|
|
|
# 1. Walk up from pwd, tracking the OUTERMOST ancestor with a canonical
|
|
# project-identity marker. The walk stops at "/" so we never escape the
|
|
# filesystem root. Markers are an allow-list (not a blacklist) so new
|
|
# build/deploy tools cannot silently establish phantom project roots.
|
|
#
|
|
# Markers: .git can be a directory (normal repo) or a file (worktree /
|
|
# submodule pointer). Everything else is a file at the directory's top
|
|
# level.
|
|
# Two tiers of markers:
|
|
# - STRONG markers (canonical version-control / language project files):
|
|
# .git, .project.yaml, package.json, pyproject.toml, Cargo.toml, Gemfile,
|
|
# go.mod. These signal "this directory is a real project of its own."
|
|
# - WEAK markers (content-only project signals): README.md, README, LICENSE.
|
|
# These catch content folders (markdown bundles, asset collections, AJ's
|
|
# loadout-style folders) that have no programming-language project files
|
|
# but ARE the user's project root.
|
|
# Rule: outermost STRONG marker wins. If no strong marker exists anywhere on
|
|
# the chain, outermost WEAK marker wins. This means a vendored sub-repo
|
|
# (e.g. `loadout/starter-pack/.git`) correctly keeps its own slug even when
|
|
# a weak-marker parent (`loadout/README.md`) is higher up — the sub-repo IS
|
|
# its own project. But a deploy-artifact-only subdir (`loadout/site/.vercel`)
|
|
# correctly folds into the content-project parent (`loadout/README.md`),
|
|
# because `.vercel` is not a marker at all.
|
|
_outermost_project_root() {
|
|
local dir="$1"
|
|
local outermost_strong=""
|
|
local outermost_weak=""
|
|
local parent="" depth=0
|
|
# Terminate on dirname's FIXED POINT, not on a literal "/": under git-bash
|
|
# on Windows a mixed-form path walks C:/Users -> C: -> . -> . forever, which
|
|
# hung every bin that evals gstack-slug (caught by windows-free-tests CI).
|
|
# The depth cap is belt-and-braces for exotic path forms (UNC, //server).
|
|
while [[ -n "$dir" && "$dir" != "/" && $depth -lt 64 ]]; do
|
|
if [[ -e "$dir/.git" \
|
|
|| -f "$dir/.project.yaml" \
|
|
|| -f "$dir/package.json" \
|
|
|| -f "$dir/pyproject.toml" \
|
|
|| -f "$dir/Cargo.toml" \
|
|
|| -f "$dir/Gemfile" \
|
|
|| -f "$dir/go.mod" ]]; then
|
|
outermost_strong="$dir"
|
|
elif [[ -f "$dir/README.md" \
|
|
|| -f "$dir/README" \
|
|
|| -f "$dir/README.rst" \
|
|
|| -f "$dir/LICENSE" \
|
|
|| -f "$dir/LICENSE.md" ]]; then
|
|
outermost_weak="$dir"
|
|
fi
|
|
parent=$(dirname "$dir")
|
|
[[ "$parent" == "$dir" ]] && break # dirname fixed point (C:/, ., //srv)
|
|
dir="$parent"
|
|
depth=$((depth + 1))
|
|
done
|
|
# Strong markers win over weak; either wins over nothing.
|
|
if [[ -n "$outermost_strong" ]]; then
|
|
printf '%s' "$outermost_strong"
|
|
else
|
|
printf '%s' "$outermost_weak"
|
|
fi
|
|
}
|
|
|
|
# 1a. Outermost REMOTE-BEARING repo root: walk the same ancestor chain and
|
|
# track the outermost dir that has a `.git` entry (directory for normal
|
|
# clones, FILE for git-worktrees/submodules — `git -C` resolves a
|
|
# worktree's remote through its main clone) AND whose `origin` remote
|
|
# resolves. This is the canonical-identity walk: a marker-only ancestor
|
|
# with no resolvable origin (stray empty ~/.git, stray package.json)
|
|
# cannot win here, so it cannot hijack remote-derived identity the way
|
|
# it can hijack the marker walk above. Nested-repo semantics preserved:
|
|
# an inner repo under an outer canonical-remote repo still resolves to
|
|
# the OUTER repo's remote (outermost wins), same as before.
|
|
# Note: git spawns only at `.git`-bearing ancestors — typically one.
|
|
_outermost_remote_repo() {
|
|
local dir="$1"
|
|
local outermost="" parent="" depth=0
|
|
while [[ -n "$dir" && "$dir" != "/" && $depth -lt 64 ]]; do
|
|
if [[ -e "$dir/.git" ]] && git -C "$dir" remote get-url origin >/dev/null 2>&1; then
|
|
outermost="$dir"
|
|
fi
|
|
parent=$(dirname "$dir")
|
|
[[ "$parent" == "$dir" ]] && break # dirname fixed point (C:/, ., //srv)
|
|
dir="$parent"
|
|
depth=$((depth + 1))
|
|
done
|
|
printf '%s' "$outermost"
|
|
}
|
|
|
|
# Only compute the project root if we don't already have a slug (env override
|
|
# took precedence). The walk is cheap (~10 stats on the deepest realistic cwd).
|
|
PROJECT_ROOT=""
|
|
if [[ -z "$SLUG" ]]; then
|
|
PROJECT_ROOT=$(_outermost_project_root "$PROJECT_DIR")
|
|
fi
|
|
|
|
# Lazy, memoized remote discovery. Needed on exactly two paths: fresh
|
|
# resolution (no usable cache) and the degraded-ancestor heal check below.
|
|
# Gating it keeps ordinary cache hits git-spawn-free.
|
|
REMOTE_ROOT=""
|
|
REMOTE_URL=""
|
|
_REMOTE_RESOLVED=0
|
|
_resolve_remote() {
|
|
if [[ "$_REMOTE_RESOLVED" -eq 1 ]]; then return 0; fi
|
|
_REMOTE_RESOLVED=1
|
|
REMOTE_ROOT=$(_outermost_remote_repo "$PROJECT_DIR")
|
|
if [[ -n "$REMOTE_ROOT" ]]; then
|
|
REMOTE_URL=$(git -C "$REMOTE_ROOT" remote get-url origin 2>/dev/null) || REMOTE_URL=""
|
|
fi
|
|
return 0
|
|
}
|
|
|
|
# 1b. Cached identity is STICKY (#2212): a project that used gstack before it
|
|
# adopted a git remote keeps its pre-origin slug — recomputing from the
|
|
# remote here would rename the project mid-life and orphan everything
|
|
# under ~/.gstack/projects/<slug>/. TWO provable bug shapes are exempt
|
|
# and fall through to recompute (self-heal):
|
|
# - Old-bug shape (#1125): the pre-walk-up resolver cached basename(pwd)
|
|
# for a SUBDIRECTORY of the real project — cached == pwd basename while
|
|
# the walk-up says pwd is NOT the project root.
|
|
# - Degraded-ancestor shape (2026-08-17), STRAY-REPO shape ONLY: the
|
|
# pre-remote-first resolver cached basename(PROJECT_ROOT) for an
|
|
# ancestor anchored by a .git entry whose origin does NOT resolve (the
|
|
# stray empty ~/.git live bug) while a remote-bearing repo BELOW it
|
|
# exists. A marker root anchored by package.json / pyproject etc. with
|
|
# NO .git is legit #2212 sticky identity (a monorepo wrapper that used
|
|
# gstack before its inner dir grew a remote) and must NOT be healed.
|
|
# Legit remote-adopting stickiness is safe too: there the repo that
|
|
# adopted the remote IS the marker root (REMOTE_ROOT == PROJECT_ROOT),
|
|
# so the heal never fires.
|
|
_CACHE_V2=0
|
|
LEGACY_NOTICE_SLUG=""
|
|
_ENTRY_FILE=""
|
|
for _f in "$CACHE_FILE" "$MAIN_CACHE_FILE" "$LEGACY_CACHE_FILE"; do
|
|
if [[ -n "$_f" && -f "$_f" ]]; then _ENTRY_FILE="$_f"; break; fi
|
|
done
|
|
if [[ -z "$SLUG" && -n "$_ENTRY_FILE" ]]; then
|
|
_RAW_CACHE=$(cat "$_ENTRY_FILE" 2>/dev/null || true)
|
|
if [[ "$_RAW_CACHE" == v2:* ]]; then
|
|
_CACHE_V2=1
|
|
_RAW_CACHE="${_RAW_CACHE#v2:}"
|
|
fi
|
|
_CACHED=$(printf '%s' "$_RAW_CACHE" | tr -cd 'a-zA-Z0-9._-')
|
|
if [[ -n "$_CACHED" ]]; then
|
|
_PWD_BASE=$(basename "$PROJECT_DIR" | tr -cd 'a-zA-Z0-9._-')
|
|
_ROOT_BASE=""
|
|
if [[ -n "$PROJECT_ROOT" ]]; then
|
|
_ROOT_BASE=$(basename "$PROJECT_ROOT" | tr -cd 'a-zA-Z0-9._-')
|
|
fi
|
|
if [[ "$_CACHED" == "$_PWD_BASE" && -n "$PROJECT_ROOT" && "$PROJECT_ROOT" != "$PROJECT_DIR" ]]; then
|
|
: # old-bug shape — recompute below and self-heal the cache
|
|
elif [[ -n "$PROJECT_ROOT" && "$_CACHED" == "$_ROOT_BASE" && -e "$PROJECT_ROOT/.git" ]] \
|
|
&& ! git -C "$PROJECT_ROOT" remote get-url origin >/dev/null 2>&1 \
|
|
&& { _resolve_remote; [[ -n "$REMOTE_URL" && "$REMOTE_ROOT" != "$PROJECT_ROOT" ]]; }; then
|
|
: # degraded-ancestor (stray-repo) shape — recompute below and self-heal the cache
|
|
elif [[ "$_CACHE_V2" -eq 1 ]]; then
|
|
SLUG="$_CACHED"
|
|
else
|
|
# Unversioned (pre-#3003) entry: recompute once. Keep the sticky value
|
|
# unless it is exactly the old last-two slug of a 3+-segment remote.
|
|
SLUG="$_CACHED"
|
|
_resolve_remote
|
|
if [[ -n "$REMOTE_URL" ]]; then
|
|
gstack_remote_slug "$REMOTE_URL"
|
|
if [[ -n "$_gri_slug" && "$_gri_slug" != "$_gri_legacy_slug" && "$_CACHED" == "$_gri_legacy_slug" ]]; then
|
|
SLUG="$_gri_slug"
|
|
LEGACY_NOTICE_SLUG="$_gri_legacy_slug"
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
|
|
# 2. Canonical remote-derived slug. Sourced from the outermost remote-bearing
|
|
# repo (see 1a) — NOT from PROJECT_ROOT, which may be a marker-only
|
|
# ancestor with no remote. The slug rule (legacy owner-repo for 2-segment
|
|
# and local remotes, "<last-two>-<16 hex>" for 3+-segment hosted remotes)
|
|
# is shared with browse/bin/remote-slug through gstack-remote-identity.sh,
|
|
# so the two bins agree on every canonical-remote repo, worktrees included.
|
|
# Parity pinned by test/gstack-slug-parity.test.ts.
|
|
if [[ -z "$SLUG" ]]; then
|
|
_resolve_remote
|
|
if [[ -n "$REMOTE_URL" ]]; then
|
|
gstack_remote_slug "$REMOTE_URL"
|
|
SLUG="$_gri_slug"
|
|
if [[ -n "$SLUG" && "$_gri_slug" != "$_gri_legacy_slug" ]]; then
|
|
LEGACY_NOTICE_SLUG="$_gri_legacy_slug"
|
|
fi
|
|
# Dot-only / degenerate guard: a hostile origin like `url = ..` (git
|
|
# accepts it) passes sed unchanged and would become SLUG=".." — filing
|
|
# state one level ABOVE ~/.gstack/projects/. Reject empty/"."/".."/
|
|
# slash-bearing slugs and fall through to the basename fallback below.
|
|
# (tr -cd already deletes "/", so */* is belt-and-braces.)
|
|
case "$SLUG" in ""|.|..|*/*) SLUG="" ;; esac
|
|
fi
|
|
fi
|
|
|
|
# 3. No git remote (or no remote at all) — use the project root's basename.
|
|
if [[ -z "$SLUG" && -n "$PROJECT_ROOT" ]]; then
|
|
SLUG=$(basename "$PROJECT_ROOT" | tr -cd 'a-zA-Z0-9._-')
|
|
fi
|
|
|
|
# 4. Final fallback: no project root found anywhere on the chain. Use pwd's
|
|
# basename (preserves the old behavior for plain non-project folders).
|
|
SLUG="${SLUG:-$(basename "$PROJECT_DIR" | tr -cd 'a-zA-Z0-9._-')}"
|
|
|
|
# Cache compare/evict/write — self-healing. Compute the cache decision AFTER
|
|
# fresh resolution so a stale cached value gets corrected on next invocation
|
|
# rather than perpetuated. Single-shot: we only ever touch the cache entry for
|
|
# the literal current pwd's key, never sweep others.
|
|
# 3b. Re-sanitize unconditionally before the value is echoed into `eval`/`source`
|
|
# output — honors the [a-zA-Z0-9._-] invariant promised in the header on
|
|
# every path (the fresh-compute design already prevents poisoned-cache
|
|
# injection, but the invariant should not depend on that reasoning).
|
|
SLUG=$(printf '%s' "$SLUG" | tr -cd 'a-zA-Z0-9._-')
|
|
|
|
# A worktree whose own pre-#2767 entry named a different bucket that still
|
|
# holds data: remember it so skill start can name the merge command.
|
|
if [[ -n "$SLUG" && "$SLUG_FROM_ENV" -eq 0 && "$_ENTRY_FILE" != "$LEGACY_CACHE_FILE" && -f "$LEGACY_CACHE_FILE" ]]; then
|
|
_OWN=$(cat "$LEGACY_CACHE_FILE" 2>/dev/null || true)
|
|
_OWN=$(printf '%s' "${_OWN#v2:}" | tr -cd 'a-zA-Z0-9._-')
|
|
_FORMER_FILE="$GSTACK_STATE_ROOT/projects/$SLUG/.former-slugs"
|
|
if [[ -n "$_OWN" && "$_OWN" != "$SLUG" && "$_OWN" != . && "$_OWN" != .. && -n "$(ls -A "$GSTACK_STATE_ROOT/projects/$_OWN" 2>/dev/null)" ]] \
|
|
&& ! grep -qxF -- "$_OWN" "$_FORMER_FILE" 2>/dev/null; then
|
|
mkdir -p "$(dirname "$_FORMER_FILE")" 2>/dev/null && printf '%s\n' "$_OWN" >> "$_FORMER_FILE" 2>/dev/null || true
|
|
fi
|
|
fi
|
|
|
|
if [[ -n "$SLUG" && "$SLUG_FROM_ENV" -eq 0 ]]; then
|
|
for _f in "$CACHE_FILE" "$LEGACY_CACHE_FILE"; do
|
|
CURRENT_CACHE=""
|
|
if [[ -f "$_f" ]]; then
|
|
CURRENT_CACHE=$(cat "$_f" 2>/dev/null || true)
|
|
fi
|
|
if [[ "$CURRENT_CACHE" != "v2:$SLUG" ]]; then
|
|
mkdir -p "$CACHE_DIR" 2>/dev/null || true
|
|
CACHE_TMP=$(mktemp "$CACHE_DIR/.slug-XXXXXX" 2>/dev/null) || CACHE_TMP=""
|
|
if [[ -n "$CACHE_TMP" ]]; then
|
|
printf 'v2:%s' "$SLUG" > "$CACHE_TMP" && mv "$CACHE_TMP" "$_f" 2>/dev/null || rm -f "$CACHE_TMP" 2>/dev/null
|
|
fi
|
|
fi
|
|
[[ "$CACHE_FILE" == "$LEGACY_CACHE_FILE" ]] && break
|
|
done
|
|
fi
|
|
|
|
# One notice on the resolve that first files this project under its new
|
|
# nested-group slug while the old shared bucket still exists (stderr only, so
|
|
# eval consumers are unaffected; later runs are v2 cache hits and stay quiet).
|
|
if [[ -n "$LEGACY_NOTICE_SLUG" && "$SLUG" != "$LEGACY_NOTICE_SLUG" && -d "$GSTACK_STATE_ROOT/projects/$LEGACY_NOTICE_SLUG" ]]; then
|
|
echo "gstack now files this project under projects/$SLUG; earlier data is still in projects/$LEGACY_NOTICE_SLUG (review and copy it with: gstack-slug --adopt-legacy)" >&2
|
|
fi
|
|
|
|
RAW_BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null) || RAW_BRANCH=""
|
|
BRANCH=$(printf '%s' "${RAW_BRANCH:-}" | tr '/' '-' | tr -cd 'a-zA-Z0-9._-')
|
|
BRANCH="${BRANCH:-unknown}"
|
|
|
|
if [[ "$MODE" == "get" && ( "$MODE_ARG" == SLUG || "$MODE_ARG" == BRANCH ) ]]; then
|
|
if [[ "$MODE_ARG" == SLUG ]]; then printf '%s\n' "$SLUG"; else printf '%s\n' "$BRANCH"; fi
|
|
exit 0
|
|
fi
|
|
FORMER_FILE="$GSTACK_STATE_ROOT/projects/$SLUG/.former-slugs"
|
|
if [[ "$MODE" == "get" && "$MODE_ARG" == FORMER_SLUGS ]]; then
|
|
# Former buckets still holding data and not yet adopted or dismissed.
|
|
while IFS= read -r _former || [[ -n "$_former" ]]; do
|
|
_former=$(printf '%s' "$_former" | tr -cd 'a-zA-Z0-9._-')
|
|
case "$_former" in ""|.|..) continue ;; esac
|
|
[[ -n "$(ls -A "$GSTACK_STATE_ROOT/projects/$_former" 2>/dev/null)" ]] && printf '%s\n' "$_former"
|
|
done < <(cat "$FORMER_FILE" 2>/dev/null || true)
|
|
exit 0
|
|
fi
|
|
_forget_former() {
|
|
[[ -f "$FORMER_FILE" ]] || return 0
|
|
local tmp
|
|
tmp=$(mktemp "$FORMER_FILE.XXXXXX") || return 1
|
|
grep -vxF -- "$1" "$FORMER_FILE" > "$tmp" || true
|
|
mv "$tmp" "$FORMER_FILE"
|
|
}
|
|
if [[ "$MODE" == "adopt-dismiss" ]]; then
|
|
_forget_former "$MODE_ARG" && echo "Dismissed projects/$MODE_ARG; its files are kept and skill start no longer names it."
|
|
exit $?
|
|
fi
|
|
if [[ "$MODE" == "adopt-from" ]]; then
|
|
FROM_BUCKET="$GSTACK_STATE_ROOT/projects/$MODE_ARG"
|
|
TO_BUCKET="$GSTACK_STATE_ROOT/projects/$SLUG"
|
|
[[ "$MODE_ARG" != "$SLUG" ]] || { echo "gstack-slug: projects/$MODE_ARG is this project's own bucket." >&2; exit 2; }
|
|
[[ -d "$FROM_BUCKET" && ! -L "$FROM_BUCKET" ]] || { echo "gstack-slug: no bucket at $FROM_BUCKET." >&2; exit 1; }
|
|
mkdir -p "$TO_BUCKET" || exit 1
|
|
MIGRATED=0; PENDING=0; CONFLICTING=0; UNCHANGED=0; CONFLICTS=""; PENDINGS=""
|
|
while IFS= read -r -d '' rel; do
|
|
rel="${rel#./}"
|
|
src="$FROM_BUCKET/$rel"; dst="$TO_BUCKET/$rel"
|
|
if [[ -L "$src" || ! -f "$src" ]]; then
|
|
PENDING=$((PENDING + 1)); PENDINGS="$PENDINGS $rel (not a regular file; review by hand)"$'\n'; continue
|
|
fi
|
|
if [[ ! -e "$dst" ]]; then
|
|
mkdir -p "$(dirname "$dst")" && cp -p "$src" "$dst" && MIGRATED=$((MIGRATED + 1)) && continue
|
|
PENDING=$((PENDING + 1)); PENDINGS="$PENDINGS $rel (copy failed)"$'\n'; continue
|
|
fi
|
|
if cmp -s "$src" "$dst"; then UNCHANGED=$((UNCHANGED + 1)); continue; fi
|
|
if [[ "$rel" == *.jsonl && -f "$dst" && ! -L "$dst" ]]; then
|
|
# Append-only logs: add the lines this bucket lacks, keeping its order.
|
|
tmp=$(mktemp "$dst.XXXXXX") || { PENDING=$((PENDING + 1)); continue; }
|
|
if { cat "$dst"; awk 'FNR == NR { seen[$0] = 1; next } !($0 in seen) { seen[$0] = 1; print }' "$dst" "$src"; } > "$tmp"; then
|
|
if cmp -s "$tmp" "$dst"; then rm -f "$tmp"; UNCHANGED=$((UNCHANGED + 1)); else mv "$tmp" "$dst"; MIGRATED=$((MIGRATED + 1)); fi
|
|
else
|
|
rm -f "$tmp"; PENDING=$((PENDING + 1)); PENDINGS="$PENDINGS $rel (merge failed)"$'\n'
|
|
fi
|
|
continue
|
|
fi
|
|
CONFLICTING=$((CONFLICTING + 1)); CONFLICTS="$CONFLICTS $rel"$'\n'
|
|
done < <(cd "$FROM_BUCKET" && find . \( -type f -o -type l \) ! -name .former-slugs -print0 2>/dev/null)
|
|
echo "adopt-legacy --from $MODE_ARG into projects/$SLUG: migrated $MIGRATED, pending $PENDING, conflicting $CONFLICTING, unchanged $UNCHANGED"
|
|
[[ -z "$PENDINGS" ]] || printf 'Pending (left in projects/%s):\n%s' "$MODE_ARG" "$PENDINGS"
|
|
[[ -z "$CONFLICTS" ]] || printf 'Conflicting (both differ; nothing overwritten, compare by hand):\n%s' "$CONFLICTS"
|
|
echo "projects/$MODE_ARG is kept; delete it yourself once you are satisfied."
|
|
_forget_former "$MODE_ARG" || true
|
|
[[ "$PENDING" -eq 0 ]]
|
|
exit $?
|
|
fi
|
|
if [[ "$MODE" == "default" ]]; then
|
|
echo "SLUG=$SLUG"
|
|
echo "BRANCH=$BRANCH"
|
|
exit 0
|
|
fi
|
|
|
|
# ── Project identity (#3003) ─────────────────────────────────────────────────
|
|
# Identity = canonical remote; the root is identity only when there is no
|
|
# remote. Roots are physical (pwd -P) so a symlinked spelling compares equal.
|
|
ID_REMOTE=""
|
|
ID_ROOT=""
|
|
ID_LEGACY=""
|
|
_resolve_identity() {
|
|
_resolve_remote
|
|
if [[ -n "$REMOTE_URL" ]]; then
|
|
gstack_remote_slug "$REMOTE_URL"
|
|
ID_REMOTE="$_gri_canon"
|
|
ID_ROOT="$REMOTE_ROOT"
|
|
if [[ -n "$_gri_legacy_slug" && "$_gri_slug" != "$_gri_legacy_slug" && "$_gri_legacy_slug" != "$SLUG" ]]; then
|
|
ID_LEGACY="$_gri_legacy_slug"
|
|
fi
|
|
else
|
|
ID_ROOT="${PROJECT_ROOT:-$(_outermost_project_root "$PROJECT_DIR")}"
|
|
ID_ROOT="${ID_ROOT:-$PROJECT_DIR}"
|
|
fi
|
|
ID_ROOT=$(cd "$ID_ROOT" 2>/dev/null && pwd -P) || ID_ROOT="$PROJECT_DIR"
|
|
}
|
|
|
|
# Prints "<remote>\037<project_root>" from the file's leading frontmatter only.
|
|
_checkpoint_fields() {
|
|
awk 'NR == 1 { if ($0 != "---") exit; next }
|
|
$0 == "---" { exit }
|
|
/^remote:/ && !r { v = $0; sub(/^remote:[ \t]*/, "", v); sub(/[ \t\r]+$/, "", v); rem = v; r = 1 }
|
|
/^project_root:/ && !p { v = $0; sub(/^project_root:[ \t]*/, "", v); sub(/[ \t\r]+$/, "", v); root = v; p = 1 }
|
|
END { printf "%s\037%s\n", rem, root }' "$1" 2>/dev/null || true
|
|
}
|
|
|
|
# Sets _ck_status: match | match-root (same remote, different root: info only)
|
|
# | foreign | unstamped (checkpoint written before identity stamping existed).
|
|
_classify_checkpoint() {
|
|
local fields r root
|
|
fields=$(_checkpoint_fields "$1")
|
|
r="${fields%%$'\037'*}"
|
|
root="${fields#*$'\037'}"
|
|
if [[ -n "$ID_REMOTE" && -n "$r" ]]; then
|
|
if [[ "$r" != "$ID_REMOTE" ]]; then _ck_status=foreign
|
|
elif [[ -n "$root" && "$root" != "$ID_ROOT" ]]; then _ck_status=match-root
|
|
else _ck_status=match
|
|
fi
|
|
elif [[ -n "$root" ]]; then
|
|
if [[ "$root" == "$ID_ROOT" ]]; then _ck_status=match; else _ck_status=foreign; fi
|
|
elif [[ -n "$r" ]]; then
|
|
_ck_status=foreign
|
|
else
|
|
_ck_status=unstamped
|
|
fi
|
|
}
|
|
|
|
# Physical root of the checkout holding $1 (nearest .git entry), or nothing.
|
|
_git_toplevel() {
|
|
local dir="$1" parent="" depth=0
|
|
while [[ -n "$dir" && $depth -lt 64 ]]; do
|
|
if [[ -e "$dir/.git" ]]; then (cd "$dir" 2>/dev/null && pwd -P); return 0; fi
|
|
parent=$(dirname "$dir")
|
|
[[ "$parent" == "$dir" ]] && break
|
|
dir="$parent"
|
|
depth=$((depth + 1))
|
|
done
|
|
return 0
|
|
}
|
|
|
|
# Prints "<branch>\037<project_root>\037<worktree>\037<title>": frontmatter
|
|
# fields and the "## Working on:" heading (the filename's title part without it).
|
|
_checkpoint_meta() {
|
|
local name
|
|
name=$(basename "$1" .md)
|
|
awk -v fallback="$name" '
|
|
function val(key) { v = $0; sub("^" key ":[ \t]*", "", v); sub(/[ \t\r]+$/, "", v); return v }
|
|
NR == 1 && $0 == "---" { fm = 1; next }
|
|
fm && $0 == "---" { fm = 0; next }
|
|
fm && /^branch:/ && !hb { b = val("branch"); hb = 1 }
|
|
fm && /^project_root:/ && !hr { r = val("project_root"); hr = 1 }
|
|
fm && /^worktree:/ && !hw { w = val("worktree"); hw = 1 }
|
|
!fm && /^## Working on:/ { t = val("## Working on"); exit }
|
|
END {
|
|
if (t == "") { t = fallback; sub(/^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9]-?/, "", t) }
|
|
printf "%s\037%s\037%s\037%s\n", b, r, w, t
|
|
}' "$1" 2>/dev/null || true
|
|
}
|
|
|
|
# Task-title form: lowercased, a leading date removed, punctuation and
|
|
# whitespace collapsed to single spaces. Generic titles normalize to nothing.
|
|
_norm_title() {
|
|
local t
|
|
t=$(printf '%s' "$1" | tr '[:upper:]' '[:lower:]' \
|
|
| sed -E 's/^[[:space:]]*[0-9]{4}-?[0-9]{2}-?[0-9]{2}([-_t ]?[0-9]{2}:?[0-9]{2}(:?[0-9]{2})?)?//; s/[[:punct:][:space:]]+/ /g; s/^ //; s/ $//')
|
|
case "$t" in wip|checkpoint|save|notes|todo) t="" ;; esac
|
|
printf '%s' "$t"
|
|
}
|
|
|
|
# Ticket tokens (#123, ABC-123), one per line.
|
|
_ticket_tokens() {
|
|
printf '%s\n' "$@" | grep -oE '#[0-9]+|[A-Z][A-Z0-9]+-[0-9]+' 2>/dev/null | sort -u || true
|
|
}
|
|
|
|
_json_str() {
|
|
local v="${1//\\/\\\\}"
|
|
v="${v//\"/\\\"}"
|
|
printf '"%s"' "$v"
|
|
}
|
|
|
|
# Prints the checkpoint path recorded in pointer $1 when it names a regular
|
|
# file inside a bucket's checkpoints directory; nothing otherwise.
|
|
_pointer_target() {
|
|
local v dir
|
|
v=$(sed -n 's/^ "checkpoint": "\(.*\)",$/\1/p' "$1" 2>/dev/null | head -1)
|
|
v="${v//\\\"/\"}"
|
|
v="${v//\\\\/\\}"
|
|
[[ -n "$v" && -f "$v" && ! -L "$v" ]] || return 0
|
|
dir=$(cd "$(dirname "$v")" 2>/dev/null && pwd -P) || return 0
|
|
[[ "$(basename "$dir")" == checkpoints && "$(dirname "$(dirname "$dir")")" == "$STATE_PHYS/projects" ]] || return 0
|
|
printf '%s\n' "$v"
|
|
}
|
|
|
|
_resolve_identity
|
|
STATE_PHYS=$(cd "$GSTACK_STATE_ROOT" 2>/dev/null && pwd -P) || STATE_PHYS="$GSTACK_STATE_ROOT"
|
|
|
|
case "$MODE" in
|
|
get)
|
|
case "$MODE_ARG" in
|
|
PROJECT_REMOTE) printf '%s\n' "$ID_REMOTE" ;;
|
|
PROJECT_ROOT) printf '%s\n' "$ID_ROOT" ;;
|
|
LEGACY_SLUG) printf '%s\n' "$ID_LEGACY" ;;
|
|
esac
|
|
;;
|
|
|
|
identity)
|
|
echo "SLUG=$SLUG"
|
|
echo "BRANCH=$BRANCH"
|
|
printf 'PROJECT_REMOTE=%q\n' "$ID_REMOTE"
|
|
printf 'PROJECT_ROOT=%q\n' "$ID_ROOT"
|
|
echo "LEGACY_SLUG=$ID_LEGACY"
|
|
;;
|
|
|
|
stamp)
|
|
[[ -f "$MODE_ARG" ]] || { echo "gstack-slug: no such checkpoint file: $MODE_ARG" >&2; exit 1; }
|
|
STAMP_TMP=$(mktemp "${MODE_ARG}.stamp-XXXXXX") || exit 1
|
|
STAMP_WORKTREE=$(_git_toplevel "$PROJECT_DIR")
|
|
[[ "$STAMP_WORKTREE" != "$ID_ROOT" ]] || STAMP_WORKTREE=""
|
|
if GRI_REMOTE="$ID_REMOTE" GRI_ROOT="$ID_ROOT" GRI_WORKTREE="$STAMP_WORKTREE" awk '
|
|
function ids() {
|
|
if (ENVIRON["GRI_REMOTE"] != "") print "remote: " ENVIRON["GRI_REMOTE"]
|
|
print "project_root: " ENVIRON["GRI_ROOT"]
|
|
if (ENVIRON["GRI_WORKTREE"] != "") print "worktree: " ENVIRON["GRI_WORKTREE"]
|
|
}
|
|
NR == 1 { if ($0 == "---") { infm = 1; print; next } print "---"; ids(); print "---" }
|
|
infm && $0 == "---" { ids(); print; infm = 0; next }
|
|
infm && (/^remote:/ || /^project_root:/ || /^worktree:/) { next }
|
|
{ print }
|
|
END { if (NR == 0) { print "---"; ids(); print "---" } }' "$MODE_ARG" > "$STAMP_TMP"; then
|
|
mv "$STAMP_TMP" "$MODE_ARG"
|
|
else
|
|
rm -f "$STAMP_TMP"
|
|
exit 1
|
|
fi
|
|
;;
|
|
|
|
classify)
|
|
while IFS= read -r ck_file || [[ -n "$ck_file" ]]; do
|
|
[[ -n "$ck_file" ]] || continue
|
|
_classify_checkpoint "$ck_file"
|
|
printf '%s\t%s\n' "$_ck_status" "$ck_file"
|
|
done
|
|
;;
|
|
|
|
below)
|
|
# Checkpoints a session saved in a repository below this directory: the
|
|
# pointers a /context-save started here left, and (outside git) other
|
|
# buckets' checkpoints whose project_root lies below the cwd. Only the 200
|
|
# newest are read; from $HOME each project shows only its newest.
|
|
BELOW_CWD=$(cd "$PROJECT_DIR" 2>/dev/null && pwd -P) || BELOW_CWD="$PROJECT_DIR"
|
|
BELOW_HOME=$(cd "${HOME:-/nonexistent}" 2>/dev/null && pwd -P) || BELOW_HOME=""
|
|
BELOW_SEEN=$'\n'; BELOW_ROOTS=$'\n'; BELOW_OUT=""
|
|
while IFS= read -r ptr; do
|
|
[[ -n "$ptr" ]] || continue
|
|
target=$(_pointer_target "$ptr")
|
|
[[ -n "$target" && "$BELOW_SEEN" != *$'\n'"$target"$'\n'* ]] || continue
|
|
BELOW_SEEN="$BELOW_SEEN$target"$'\n'
|
|
BELOW_OUT="$BELOW_OUT$(basename "$target")"$'\t'"POINTER $target"$'\n'
|
|
done < <(find "$STATE_PHYS/projects/$SLUG/checkpoint-pointers" -maxdepth 1 -name '*.json' -type f 2>/dev/null | LC_ALL=C sort -r | head -200)
|
|
if [[ -z "$GIT_COMMON_DIR" ]]; then
|
|
while IFS= read -r f; do
|
|
[[ -n "$f" && "$BELOW_SEEN" != *$'\n'"$f"$'\n'* ]] || continue
|
|
meta=$(_checkpoint_meta "$f")
|
|
IFS=$'\037' read -r _b root _w _t <<<"$meta"
|
|
[[ -n "$root" && "$root" == "$BELOW_CWD"/* ]] || continue
|
|
if [[ "$BELOW_CWD" == "$BELOW_HOME" ]]; then
|
|
[[ "$BELOW_ROOTS" != *$'\n'"$root"$'\n'* ]] || continue
|
|
BELOW_ROOTS="$BELOW_ROOTS$root"$'\n'
|
|
fi
|
|
BELOW_OUT="$BELOW_OUT$(basename "$f")"$'\t'"BELOW_CWD $f"$'\n'
|
|
done < <(find "$STATE_PHYS/projects" -mindepth 3 -maxdepth 3 -path '*/checkpoints/*.md' -type f \
|
|
! -path "$STATE_PHYS/projects/$SLUG/*" 2>/dev/null \
|
|
| awk -F/ '{ print $NF "\t" $0 }' | LC_ALL=C sort -r | head -200 | cut -f2-)
|
|
fi
|
|
printf '%s' "$BELOW_OUT" | LC_ALL=C sort -r | head -20 | cut -f2-
|
|
;;
|
|
|
|
point)
|
|
# A /context-save that started in DIR but filed elsewhere (a nested repo)
|
|
# leaves a JSON pointer in DIR's bucket so /context-restore there finds it.
|
|
[[ -d "$MODE_ARG" ]] || { echo "gstack-slug: no such start directory: $MODE_ARG" >&2; exit 1; }
|
|
[[ -f "$MODE_ARG2" && ! -L "$MODE_ARG2" ]] || { echo "gstack-slug: no such checkpoint file: $MODE_ARG2" >&2; exit 1; }
|
|
PT_FILE="$(cd "$(dirname "$MODE_ARG2")" && pwd -P)/$(basename "$MODE_ARG2")"
|
|
PT_BUCKET=$(basename "$(dirname "$(dirname "$PT_FILE")")")
|
|
[[ "$(basename "$(dirname "$PT_FILE")")" == checkpoints && "$(dirname "$(dirname "$(dirname "$PT_FILE")")")" == "$STATE_PHYS/projects" ]] \
|
|
|| { echo "gstack-slug: $MODE_ARG2 is not a saved checkpoint under $GSTACK_STATE_ROOT/projects" >&2; exit 1; }
|
|
PT_START=$(cd "$MODE_ARG" && "$0" --get SLUG 2>/dev/null) || exit 1
|
|
case "$PT_START" in ""|.|..) exit 1 ;; esac
|
|
[[ "$PT_START" != "$PT_BUCKET" ]] || exit 0
|
|
IFS=$'\037' read -r _b PT_ROOT _w _t <<<"$(_checkpoint_meta "$PT_FILE")"
|
|
PT_DIR="$GSTACK_STATE_ROOT/projects/$PT_START/checkpoint-pointers"
|
|
mkdir -p "$PT_DIR" || exit 1
|
|
PT_OUT="$PT_DIR/$(basename "$PT_FILE" .md)--$PT_BUCKET.json"
|
|
printf '{\n "checkpoint": %s,\n "bucket": %s,\n "project_root": %s\n}\n' \
|
|
"$(_json_str "$PT_FILE")" "$(_json_str "$PT_BUCKET")" "$(_json_str "$PT_ROOT")" > "$PT_OUT" || exit 1
|
|
echo "POINTER_WRITTEN $PT_OUT"
|
|
;;
|
|
|
|
newer-task)
|
|
# Restore candidates arrive current-branch first. When another branch of
|
|
# this repository holds a newer checkpoint for the same task (a worktree
|
|
# below the main tree, the same title, or the same ticket token), name it
|
|
# so /context-restore shows both instead of silently taking the branch match.
|
|
NT_FIRST=""; NT_FB=""; NT_FR=""; NT_FW=""; NT_FT=""; NT_FTOK=""
|
|
NT_HERE=$(_git_toplevel "$PROJECT_DIR")
|
|
NT_MAIN=""
|
|
[[ "$(basename "$GIT_COMMON_DIR")" != .git ]] || NT_MAIN=$(dirname "$GIT_COMMON_DIR")
|
|
while IFS= read -r f || [[ -n "$f" ]]; do
|
|
[[ -n "$f" ]] || continue
|
|
if [[ -n "$NT_FIRST" ]]; then
|
|
nb=$(basename "$f"); fb=$(basename "$NT_FIRST")
|
|
[[ "${nb:0:15}" > "${fb:0:15}" ]] || continue
|
|
fi
|
|
IFS=$'\037' read -r b root wt title <<<"$(_checkpoint_meta "$f")"
|
|
if [[ -z "$NT_FIRST" ]]; then
|
|
[[ -n "$MODE_ARG" && "$b" == "$MODE_ARG" ]] || exit 0
|
|
NT_FIRST="$f"; NT_FB="$b"; NT_FT=$(_norm_title "$title"); NT_FTOK=$(_ticket_tokens "$title" "$b")
|
|
continue
|
|
fi
|
|
[[ "$b" != "$NT_FB" ]] || continue
|
|
wt="${wt:-$root}"
|
|
if [[ -n "$NT_MAIN" && "$NT_HERE" == "$NT_MAIN" && "$wt" == "$NT_MAIN"/* ]]; then
|
|
echo "NEWER_TASK $f"; exit 0
|
|
fi
|
|
nt=$(_norm_title "$title")
|
|
if [[ -n "$nt" && "$nt" == "$NT_FT" ]]; then echo "NEWER_TASK $f"; exit 0; fi
|
|
if [[ -n "$NT_FTOK" ]] && [[ -n "$(comm -12 <(printf '%s\n' "$NT_FTOK") <(_ticket_tokens "$title" "$b") 2>/dev/null)" ]]; then
|
|
echo "NEWER_TASK $f"; exit 0
|
|
fi
|
|
done
|
|
;;
|
|
|
|
adopt)
|
|
if [[ -z "$ID_LEGACY" ]]; then
|
|
echo "Nothing to adopt: this project's slug ($SLUG) did not change."
|
|
exit 0
|
|
fi
|
|
OLD_BUCKET="$GSTACK_STATE_ROOT/projects/$ID_LEGACY"
|
|
NEW_BUCKET="$GSTACK_STATE_ROOT/projects/$SLUG"
|
|
if [[ ! -d "$OLD_BUCKET" ]]; then
|
|
echo "Nothing to adopt: no earlier bucket at $OLD_BUCKET."
|
|
exit 0
|
|
fi
|
|
OLD_REAL=$(cd "$OLD_BUCKET" && pwd -P)
|
|
|
|
# Sets _ad_label and _ad_copyable (1/0) for one path relative to OLD_BUCKET.
|
|
_adopt_label() {
|
|
_ad_copyable=1
|
|
case "$1" in
|
|
checkpoints/*.md)
|
|
_classify_checkpoint "$OLD_BUCKET/$1"
|
|
case "$_ck_status" in
|
|
match|match-root) _ad_label="checkpoint: matching this project" ;;
|
|
foreign) _ad_label="checkpoint: another project (not copyable)"; _ad_copyable=0 ;;
|
|
*) _ad_label="checkpoint: unknown project (saved before identity stamps)" ;;
|
|
esac ;;
|
|
*) _ad_label="no project identity: the old bucket may be shared, check before copying" ;;
|
|
esac
|
|
if [[ "$_ad_copyable" -eq 1 && -e "$NEW_BUCKET/$1" ]]; then
|
|
_ad_label="$_ad_label; already in new bucket (skipped)"; _ad_copyable=0
|
|
fi
|
|
}
|
|
|
|
_adopt_copy() {
|
|
mkdir -p "$(dirname "$NEW_BUCKET/$1")" && cp -p "$OLD_BUCKET/$1" "$NEW_BUCKET/$1" && echo "COPIED $1"
|
|
}
|
|
|
|
if [[ ${#COPY_PATHS[@]} -gt 0 ]]; then
|
|
ADOPT_RC=0
|
|
for rel in "${COPY_PATHS[@]}"; do
|
|
case "/$rel/" in
|
|
*/../*|*/./*|//*) echo "REFUSED $rel (must be a plain path relative to $OLD_BUCKET)"; ADOPT_RC=1; continue ;;
|
|
esac
|
|
src="$OLD_BUCKET/$rel"
|
|
src_dir=$(cd "$(dirname "$src")" 2>/dev/null && pwd -P) || src_dir=""
|
|
if [[ ! -f "$src" || -L "$src" || -z "$src_dir" ]] || [[ "$src_dir" != "$OLD_REAL" && "$src_dir" != "$OLD_REAL"/* ]]; then
|
|
echo "REFUSED $rel (not a regular file inside $OLD_BUCKET)"; ADOPT_RC=1; continue
|
|
fi
|
|
_adopt_label "$rel"
|
|
if [[ "$_ad_copyable" -eq 0 ]]; then
|
|
echo "SKIPPED $rel ($_ad_label)"; continue
|
|
fi
|
|
_adopt_copy "$rel" || ADOPT_RC=1
|
|
done
|
|
exit "$ADOPT_RC"
|
|
fi
|
|
|
|
echo "gstack now files this project under: $NEW_BUCKET"
|
|
echo "Earlier data (shared nested-group bucket): $OLD_BUCKET"
|
|
echo "Nothing is copied unless you confirm it. Files:"
|
|
ADOPT_FILES=$(cd "$OLD_BUCKET" && find . -type f 2>/dev/null | sed 's#^\./##' | LC_ALL=C sort)
|
|
INTERACTIVE=0
|
|
if [[ -t 0 && -t 1 ]]; then INTERACTIVE=1; fi
|
|
while IFS= read -r rel; do
|
|
[[ -n "$rel" ]] || continue
|
|
_adopt_label "$rel"
|
|
echo " $rel [$_ad_label]"
|
|
if [[ "$INTERACTIVE" -eq 1 && "$_ad_copyable" -eq 1 ]]; then
|
|
printf ' copy into the new bucket? [y/N] '
|
|
ans=""
|
|
read -r ans </dev/tty || ans=""
|
|
case "$ans" in y|Y|yes|YES) _adopt_copy "$rel" ;; esac
|
|
fi
|
|
done <<ADOPT_LIST
|
|
$ADOPT_FILES
|
|
ADOPT_LIST
|
|
if [[ "$INTERACTIVE" -eq 0 ]]; then
|
|
echo "Nothing copied. Copy chosen files with: gstack-slug --adopt-legacy --copy <path> [<path>...]"
|
|
fi
|
|
;;
|
|
esac
|