fix(slug): give nested-group projects their own state bucket and verify checkpoint identity (#3003, #2901)

gstack-slug kept only the last two remote path segments, so
customer-a/product/repo and customer-b/product/repo shared one bucket
and /context-restore could present another project's checkpoint.

- One canonical-remote rule (bash + TS, golden vectors) used by all six
  resolvers: lowercased host, no userinfo/port/.git, Azure DevOps and
  Bitbucket Server normalized. 3+ segment remotes get
  <last-two>-<16 hex>; two-segment remotes (all of GitHub) are unchanged.
- Versioned sticky cache (v2:) keeps cache hits git-free.
- context-save stamps the credential-free remote and root;
  context-restore only treats this project's checkpoints as latest,
  reports foreign/unverified ones first, and treats a different root
  with the same remote (Conductor handoff) as information.
- gstack-slug --adopt-legacy copies only files the user confirms.
- question-preference-hook reads the same versioned cache, so never-ask
  preferences fire; unknown identity asks instead of auto-deciding.
This commit is contained in:
garrytan committed 2026-10-02 14:49:15 +00:00
1 parent bc8bec4df2
commit 63a6cbb8ee
34 files changed
+1745 -130

No files matched your search

+2 -2
View File
@@ -199,9 +199,9 @@ function generatePlanFileDiscovery(ship = false): string {
setopt +o nomatch 2>/dev/null || true # zsh compat
BRANCH=$(git branch --show-current 2>/dev/null | tr '/' '-' | tr -cd 'a-zA-Z0-9._-')
REPO=$(basename "$(git rev-parse --show-toplevel 2>/dev/null)")
_PLAN_SLUG=$(git remote get-url origin 2>/dev/null | sed 's|.*[:/]\\([^/]*/[^/]*\\)\\.git$|\\1|;s|.*[:/]\\([^/]*/[^/]*\\)$|\\1|' | tr '/' '-' | tr -cd 'a-zA-Z0-9._-') || true
_PLAN_SLUG="\${_PLAN_SLUG:-$(basename "$PWD" | tr -cd 'a-zA-Z0-9._-')}"
eval "$(~/.claude/skills/gstack/bin/gstack-paths)"; : "\${GSTACK_STATE_ROOT:?gstack-paths failed; reinstall with ./setup or /gstack-upgrade}"
_PLAN_SLUG=$(~/.claude/skills/gstack/bin/gstack-slug 2>/dev/null | sed -n 's/^SLUG=//p') || true
_PLAN_SLUG="\${_PLAN_SLUG:-$(basename "$PWD" | tr -cd 'a-zA-Z0-9._-')}"
for PLAN_DIR in "$GSTACK_STATE_ROOT/projects/$_PLAN_SLUG" "$HOME/.claude/plans" "$HOME/.codex/plans" ".gstack/plans"; do
[ -d "$PLAN_DIR" ] || continue
PLAN=$(ls -t "$PLAN_DIR"/*.md 2>/dev/null | xargs grep -l "$BRANCH" 2>/dev/null | head -1)
+1 -1
View File
@@ -111,7 +111,7 @@
"test/ceo-mode-expansion-disposition.test.ts\tTS7053\tElement implicitly has an 'any' type because expression of type 'string' can't be used to index type '{ \"D3 \\u2014 E1: Add project-shared views alongside private views?\\nProject/branch/task: main; saved project views plan, ledger row L1 (ownership scope).\\nELI10: Right now the plan saves a view for one member only. Shared views let the person who builds \\\"Blocked on design, by priority\\\" publish it to the whole proj...'. No index signature with a parameter of type 'string' was found on type '{ \"D3 \\u2014 E1: Add project-shared views alongside private views?\\nProject/branch/task: main; saved project views plan, ledger row L1 (ownership scope).\\nELI10: Right now the plan saves a view for one member only. Shared views let the person who builds \\\"Blocked on design, by priority\\\" publish it to the whole proj...'.": 1,
"test/ceo-mode-expansion-disposition.test.ts\tTS7053\tElement implicitly has an 'any' type because expression of type 'string' can't be used to index type '{ \"D4.1 \\u2014 E1: Shared project views. Add to this plan's scope?\\nProject/branch/task: main, PLAN.md saved views, SCOPE EXPANSION, D2 schema approved (visibility column exists).\\nELI10: Today's plan gives each member private views. E1 lets a member publish a view to the whole project (\\\"Blocked\\\", \\\"This sprint\\\")...'. No index signature with a parameter of type 'string' was found on type '{ \"D4.1 \\u2014 E1: Shared project views. Add to this plan's scope?\\nProject/branch/task: main, PLAN.md saved views, SCOPE EXPANSION, D2 schema approved (visibility column exists).\\nELI10: Today's plan gives each member private views. E1 lets a member publish a view to the whole project (\\\"Blocked\\\", \\\"This sprint\\\")...'.": 1,
"test/ceo-mode-option.test.ts\tTS2322\tType '{ [x: string]: string; }' is not assignable to type '{ \"D2 \\u2014 Which review mode should govern this plan? (ledger row R1)\\nProject/branch/task: gstack-plan-count-w6cXCj on main, PLAN.md: saved project views.\\nELI10: The mode sets my posture for the rest of the review. Expansion means I pitch bigger versions and ask you about each. Selective means I keep your scope,...'. Property '\"D3.0 \\u2014 Seven expansion proposals are on the table. How should I walk them?\\nProject/branch/task: gstack-plan-count-w6cXCj on main, saved project views, SCOPE EXPANSION mode.\\nELI10: The proposals are E1 project-shared views, E2 default views, E3 stale-filter handling, E4 URL-addressable views, E5 pilot instrumentation, E6 dirty-state Update/Save-as-new, E7 delight pack (rename, duplicate, save nudge, shortcut, empty state, page title). Each is a separate scope call. I can ask one question per item (7 questions, each Add / Defer / Skip / Hold), or first propose a smaller set, or batch them into groups. Dependencies: E2's project default needs E1; E4 cross-member links need E1; E5 is what makes the pilot metric real for everything else.\\nStakes if we pick wrong: Per-item gives you full control at the cost of 7 prompts; batching is faster but risks lumping unrelated decisions together.\\nRecommendation: A because every proposal is independently shippable and this mode exists to let you weigh each one.\\nNote: options differ in kind, not coverage \\u2014 no completeness score.\\nNet: decision precision versus prompt count.\"' is missing in type '{ [x: string]: string; }' but required in type '{ \"D3.0 \\u2014 Seven expansion proposals are on the table. How should I walk them?\\nProject/branch/task: gstack-plan-count-w6cXCj on main, saved project views, SCOPE EXPANSION mode.\\nELI10: The proposals are E1 project-shared views, E2 default views, E3 stale-filter handling, E4 URL-addressable views, E5 pilot instr...'.": 1,
"test/ceo-mode-option.test.ts\tTS2345\tArgument of type '({ content?: undefined; isError?: undefined; kind: string; sessionId: string; timestamp: string; toolUseId: string; name: string; input: { questions: { header: string; question: string; options: { label: string; description: string; }[]; multiSelect: boolean; }[]; }; } | { ...; })[]' is not assignable to parameter of type 'readonly NativePublicToolEvent[]'. Type '{ content?: undefined; isError?: undefined; kind: string; sessionId: string; timestamp: string; toolUseId: string; name: string; input: { questions: { header: string; question: string; options: { label: string; description: string; }[]; multiSelect: boolean; }[]; }; } | { ...; }' is not assignable to type 'NativePublicToolEvent'. Type '{ content?: undefined; isError?: undefined; kind: string; sessionId: string; timestamp: string; toolUseId: string; name: string; input: { questions: { header: string; question: string; options: { label: string; description: string; }[]; multiSelect: boolean; }[]; }; }' is not assignable to type 'NativePublicToolEvent'. Types of property 'kind' are incompatible. Type 'string' is not assignable to type '\"result\" | \"use\"'.": 5,
"test/ceo-mode-option.test.ts\tTS2345\tArgument of type '({ isError?: undefined; content?: undefined; kind: string; sessionId: string; timestamp: string; toolUseId: string; name: string; input: { questions: { header: string; question: string; options: { label: string; description: string; }[]; multiSelect: boolean; }[]; }; } | { ...; })[]' is not assignable to parameter of type 'readonly NativePublicToolEvent[]'. Type '{ isError?: undefined; content?: undefined; kind: string; sessionId: string; timestamp: string; toolUseId: string; name: string; input: { questions: { header: string; question: string; options: { label: string; description: string; }[]; multiSelect: boolean; }[]; }; } | { ...; }' is not assignable to type 'NativePublicToolEvent'. Type '{ isError?: undefined; content?: undefined; kind: string; sessionId: string; timestamp: string; toolUseId: string; name: string; input: { questions: { header: string; question: string; options: { label: string; description: string; }[]; multiSelect: boolean; }[]; }; }' is not assignable to type 'NativePublicToolEvent'. Types of property 'kind' are incompatible. Type 'string' is not assignable to type '\"result\" | \"use\"'.": 5,
"test/ceo-mode-option.test.ts\tTS2345\tArgument of type '{ status: 'ready'; calls: ({ sessionId: string; toolUseId: string; questions: { question: string; header: string; multiSelect: boolean; options: { label: string; description: string; }[]; }[]; answered: boolean; failed: boolean; answers: { \"D3 \\u2014 Which review mode should govern this plan?\\nProject/branch/task: f...' is not assignable to parameter of type 'PlanCountTranscript'. Types of property 'calls' are incompatible. Type '({ sessionId: string; toolUseId: string; questions: { question: string; header: string; multiSelect: boolean; options: { label: string; description: string; }[]; }[]; answered: boolean; failed: boolean; answers: { ...; }; unansweredQuestionIndices: never[]; answeredAt: string; } | { ...; })[]' is not assignable to type 'NativePlanQuestionCall[]'. Type '{ sessionId: string; toolUseId: string; questions: { question: string; header: string; multiSelect: boolean; options: { label: string; description: string; }[]; }[]; answered: boolean; failed: boolean; answers: { ...; }; unansweredQuestionIndices: never[]; answeredAt: string; } | { ...; }' is not assignable to type 'NativePlanQuestionCall'. Type '{ sessionId: string; toolUseId: string; questions: { question: string; header: string; multiSelect: boolean; options: { label: string; description: string; }[]; }[]; answered: boolean; failed: boolean; answers: { \"D3 \\u2014 Which review mode should govern this plan?\\nProject/branch/task: fixture repo on main; review...' is not assignable to type 'NativePlanQuestionCall'. Types of property 'answers' are incompatible. Type '{ \"D3 \\u2014 Which review mode should govern this plan?\\nProject/branch/task: fixture repo on main; reviewing PLAN.md \\\"Add saved project views\\\" (per-member named filter+sort presets on a project task list).\\nELI10: The mode sets my posture for the rest of the review. It decides whether I push you to build a bigger...' is not assignable to type 'Record<string, string>'. Property '\"D4.1 \\u2014 E1: Store views using the task list's existing filter/sort serialization?\\nProject/branch/task: main; saved project views plan, SCOPE EXPANSION, proposal 1 of 6.\\nELI10: Your task list already turns filters and sort into some encoded shape (usually the URL query string). A saved view should persist exactly that shape, not a new hand-rolled JSON schema. Then saved views, URLs, and shared links all speak one language, and when you add a new filter next quarter, old views keep working without a migration.\\nStakes if we pick wrong: Two filter encodings drift apart; every new filter needs a stored-view migration; deep links (E2) and shared views (E3) need translation code.\\nRecommendation: Add because it is the cheapest item here (human ~0.5 d / CC ~15 min) and it is the foundation E2\\u2013E4 stand on.\\nCompleteness: A=10/10, B=5/10, C=3/10, D=n/a\\nNet: one canonical filter language now vs. a second schema you maintain forever.\"' is incompatible with index signature. Type 'undefined' is not assignable to type 'string'.": 1,
"test/ceo-mode-option.test.ts\tTS2741\tProperty '\"D3.0 \\u2014 Seven expansion proposals are on the table. How should I walk them?\\nProject/branch/task: gstack-plan-count-w6cXCj on main, saved project views, SCOPE EXPANSION mode.\\nELI10: The proposals are E1 project-shared views, E2 default views, E3 stale-filter handling, E4 URL-addressable views, E5 pilot instrumentation, E6 dirty-state Update/Save-as-new, E7 delight pack (rename, duplicate, save nudge, shortcut, empty state, page title). Each is a separate scope call. I can ask one question per item (7 questions, each Add / Defer / Skip / Hold), or first propose a smaller set, or batch them into groups. Dependencies: E2's project default needs E1; E4 cross-member links need E1; E5 is what makes the pilot metric real for everything else.\\nStakes if we pick wrong: Per-item gives you full control at the cost of 7 prompts; batching is faster but risks lumping unrelated decisions together.\\nRecommendation: A because every proposal is independently shippable and this mode exists to let you weigh each one.\\nNote: options differ in kind, not coverage \\u2014 no completeness score.\\nNet: decision precision versus prompt count.\"' is missing in type '{ [x: string]: string; }' but required in type '{ \"D3.0 \\u2014 Seven expansion proposals are on the table. How should I walk them?\\nProject/branch/task: gstack-plan-count-w6cXCj on main, saved project views, SCOPE EXPANSION mode.\\nELI10: The proposals are E1 project-shared views, E2 default views, E3 stale-filter handling, E4 URL-addressable views, E5 pilot instr...'.": 1,
"test/ceo-mode-option.test.ts\tTS2741\tProperty '\"D4.1 \\u2014 E1: Store views using the task list's existing filter/sort serialization?\\nProject/branch/task: main; saved project views plan, SCOPE EXPANSION, proposal 1 of 6.\\nELI10: Your task list already turns filters and sort into some encoded shape (usually the URL query string). A saved view should persist exactly that shape, not a new hand-rolled JSON schema. Then saved views, URLs, and shared links all speak one language, and when you add a new filter next quarter, old views keep working without a migration.\\nStakes if we pick wrong: Two filter encodings drift apart; every new filter needs a stored-view migration; deep links (E2) and shared views (E3) need translation code.\\nRecommendation: Add because it is the cheapest item here (human ~0.5 d / CC ~15 min) and it is the foundation E2\\u2013E4 stand on.\\nCompleteness: A=10/10, B=5/10, C=3/10, D=n/a\\nNet: one canonical filter language now vs. a second schema you maintain forever.\"' is missing in type '{ [x: string]: string; }' but required in type '{ \"D3 \\u2014 Which review mode should govern this plan?\\nProject/branch/task: fixture repo on main; reviewing PLAN.md \\\"Add saved project views\\\" (per-member named filter+sort presets on a project task list).\\nELI10: The mode sets my posture for the rest of the review. It decides whether I push you to build a bigger...'.": 1,