jared/cc-os
Watch
1
0
Fork
You've already forked cc-os
 0
Code Issues 147 Pull requests Projects Releases Packages Wiki Activity

os-sdlc: add os-sdlc-workspace merge subcommand for code-owned merge-back [capture] #266

New issue
Open
opened 2026-08-04 17:18:49 +00:00 by jared · 3 comments
jared commented 2026-08-04 17:18:49 +00:00
Owner
Copy link

Context

Follow-up from #263. Implement steps 13–15 still perform merge-back as freeform AI-run git. Add an os-sdlc-workspace merge subcommand: verify verdict recorded, merge sdlc/ into the main checkout's current branch, verify the merge landed, leaving teardown as the only remaining step. Principle: invariants live in the CLI, prose only narrates (see #263 refine notes). Do not start until #263's TeardownPreflight lands.

## Context Follow-up from #263. Implement steps 13–15 still perform merge-back as freeform AI-run git. Add an os-sdlc-workspace merge <n> subcommand: verify verdict recorded, merge sdlc/<n> into the main checkout's current branch, verify the merge landed, leaving teardown as the only remaining step. Principle: invariants live in the CLI, prose only narrates (see #263 refine notes). Do not start until #263's TeardownPreflight lands.
jared commented 2026-08-04 17:27:17 +00:00
Author
Owner
Copy link

Triage: body mischaracterizes steps 13-15 — implement SKILL.md:104-120 forbids AI merge ('Do not merge or commit on the human's behalf'); the human merges outside the skill. os-sdlc-workspace has only setup/teardown; TeardownPreflight does not exist yet (#263 not landed). Ticket needs rewording (CLI-ify the human-directed merge, not replace AI-run git) before it's workable. Blocked on #263.

Triage: body mischaracterizes steps 13-15 — implement SKILL.md:104-120 forbids AI merge ('Do not merge or commit on the human's behalf'); the human merges outside the skill. os-sdlc-workspace has only setup/teardown; TeardownPreflight does not exist yet (#263 not landed). Ticket needs rewording (CLI-ify the human-directed merge, not replace AI-run git) before it's workable. Blocked on #263.
jared commented 2026-08-13 18:13:08 +00:00
Author
Owner
Copy link

Triage: #263 (TeardownPreflight) landed/closed, so this is now unblocked. Body still needs the reword @jared flagged (CLI-ify human-directed merge, not replace AI-run git).

Triage: #263 (TeardownPreflight) landed/closed, so this is now unblocked. Body still needs the reword @jared flagged (CLI-ify human-directed merge, not replace AI-run git).
jared commented 2026-08-16 14:26:04 +00:00
Author
Owner
Copy link

Frozen in the 2026-08-16 backlog reset — see #419 for the expiry procedure. Do not work unless a live run rediscovers this issue.

Frozen in the 2026-08-16 backlog reset — see #419 for the expiry procedure. Do not work unless a live run rediscovers this issue.
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
main
No results found.
Labels
Clear labels   
P0
Priority 0 — drop everything

  
P1
Priority 1 — next up

  
P2
Priority 2 — normal

  
P3
Priority 3 — someday

  
bug
Something is broken

  
create
Ticket creates something new

  
delete
Ticket removes something

  
enhancement
New feature or improvement

  
filed-by/agent

   
filed-by/user

   
frozen
Pre-reset backlog freeze 2026-08-16; do not work unless rediscovered by a live run

  
lint-rule
Ticket proposes/modifies a lint rule or cop

  
needs-info
Waiting on reporter for more information

  
needs-triage
Maintainer needs to evaluate this issue

  
next
Human-curated next up — AI never applies or removes

  
plugin/cc-architect
Scope: the cc-architect plugin

  
plugin/os
Scope: the os plugin

  
plugin/os-adr
Scope: the os-adr plugin

  
plugin/os-aidd-lint
Scope: the os-aidd-lint plugin

  
plugin/os-backlog
Scope: the os-backlog plugin

  
plugin/os-context
Scope: the os-context plugin

  
plugin/os-doc-hygiene
Scope: the os-doc-hygiene plugin

  
plugin/os-sdlc
Scope: the os-sdlc plugin

  
plugin/os-vault
Scope: the os-vault plugin

  
project/cc-os
Parent-scope: cc-os repo-wide, not specific to one plugin

  
ready-for-agent
Triage complete; an agent can pick this up

  
ready-for-human
Human-owned; never picked up autonomously

  
recurring
Recurring flavor: occurrence outcomes commented, never closed by AI

  
review
Shipped semi work awaiting human sign-off

  
update
Ticket updates something existing

  
waiting
Blocked; blocker named in a comment

  
wayfinder:grilling

   
wayfinder:map

   
wayfinder:map
wayfinder map ticket

  
wayfinder:research

   
wayfinder:task

   
wayfinder:task
wayfinder map child: task

  
wontfix
Will not be actioned

  
worklist/deviations
Deviation incidents from skill/pipeline runs — evidence pile for correcting the owning artifact

  
worklist/lint-rule
Proposed os-sdlc or os-aidd-lint rule

  
worklist/new-implement-build
Updated implementation harness (ast-grep + stepper)

No labels
P0
P1
P2
P3
bug
create
delete
enhancement
filed-by/agent
filed-by/user
frozen
lint-rule
needs-info
needs-triage
next
plugin/cc-architect
plugin/os
plugin/os-adr
plugin/os-aidd-lint
plugin/os-backlog
plugin/os-context
plugin/os-doc-hygiene
plugin/os-sdlc
plugin/os-vault
project/cc-os
ready-for-agent
ready-for-human
recurring
review
update
waiting
wayfinder:grilling
wayfinder:map
wayfinder:map
wayfinder:research
wayfinder:task
wayfinder:task
wontfix
worklist/deviations
worklist/lint-rule
worklist/new-implement-build
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
jared/cc-os#266
No description provided.