refactor: C1 move-only — seven-layer source tree

.claude/skills/adding-skill-program/SKILL.md

@@ -33,7 +33,7 @@ them.
   `cliEntries`. A new skill-backed child of an existing family ships through
   context-mill; inspect
   [family dispatch](../../../src/programs/dispatch-family.ts). Unpromoted
-  skills run through [the skill command](../../../src/commands/skill.ts).
+  skills run through [the skill command](../../../src/cli/commands/skill.ts).
 - **Native program:** use a
   [ProgramConfig](../../../src/programs/program-step.ts) when the wizard
   needs its own flow, screens, detection, composition, or other native behavior.
@@ -66,7 +66,7 @@ changing execution behavior.
    [Existing binding checks](../../../src/agent/runner/__tests__/switchboard.test.ts)
    enforce coverage; `ProgramId` currently widens to `string`.
 4. For a standalone native command, create a command module with
-   [nativeCommandFactory](../../../src/commands/factories/native-command-factory.ts)
+   [nativeCommandFactory](../../../src/cli/commands/factories/native-command-factory.ts)
    and register it in [bin.ts](../../../bin.ts). A native family child uses the
    handlers in family dispatch. Program registration derives screen sequences
    and store lookup, not the top-level CLI `.use()` chain.
@@ -82,7 +82,7 @@ or changing gateway-required prompt material.
 ## Simple linear programs and existing flows
 
 For a very simple linear flow, use
-[createSkillProgram](../../../src/programs/agent-skill/index.ts) to
+[createSkillProgram](../../../src/programs/shared/skill-program.ts) to
 configure installation of one skill. Register the native program as above with
 an explicit Pi/linear binding; the factory does not select a sequence. Read
 `SkillProgramOptions` for required fields;
@@ -102,21 +102,21 @@ does not preserve these behaviors automatically.
 
 ## Screens, prerequisites, and composition
 
-Reuse [AGENT_SKILL_STEPS](../../../src/programs/agent-skill/steps.ts):
+Reuse [AGENT_SKILL_STEPS](../../../src/programs/shared/skill-steps.ts):
 intro, health check, auth, run, outro, and keep-skills. Auth also applies the
 shared [AI opt-in gate](../../../src/programs/ai-opt-in-gate.ts) for agent
 programs. Override `screenId`, not `screen`, when adapting a step. New screens
-need an entry in [ScreenId](../../../src/ui/tui/screen-sequences.ts), a
+need an entry in [ScreenId](../../../src/tui/screen-sequences.ts), a
 component, and registration in
-[screen-registry](../../../src/ui/tui/screen-registry.tsx). Follow
+[screen-registry](../../../src/tui/screen-registry.tsx). Follow
 [ink-tui](../ink-tui/SKILL.md) for rendering and store usage.
 
 Use a headless step's `onReady` for session-dependent detection, then render
 structured `frameworkContext.detectError` data in the intro. `onInit` runs when
 the TUI starts rendering with its initial session; `onReady` runs after the real
-session is assigned. See [store hooks](../../../src/ui/tui/store.ts) and
-[run-wizard](../../../src/lib/runners/run-wizard.ts). The
-[noninteractive runner](../../../src/lib/runners/run-non-interactive.ts) also
+session is assigned. See [store hooks](../../../src/tui/store.ts) and
+[run-wizard](../../../src/cli/runners/run-wizard.ts). The
+[noninteractive runner](../../../src/cli/runners/run-non-interactive.ts) also
 walks `onReady` by default; set `ciPreRun` only when it needs a different
 prerequisite strategy.
 

.claude/skills/ink-tui/SKILL.md

@@ -34,11 +34,11 @@ conventions rather than copying upstream component manuals.
 
 ## Add a screen
 
-1. Create a component in [screens](../../../src/ui/tui/screens/).
+1. Create a component in [screens](../../../src/tui/screens/).
 2. Add its `ScreenId` in
-   [screen-sequences.ts](../../../src/ui/tui/screen-sequences.ts).
+   [screen-sequences.ts](../../../src/tui/screen-sequences.ts).
 3. Register the component in
-   [screen-registry.tsx](../../../src/ui/tui/screen-registry.tsx).
+   [screen-registry.tsx](../../../src/tui/screen-registry.tsx).
 4. Reference it through `screenId` in the owning
    [program's steps](../../../src/programs/), with the appropriate
    visibility, completion, and gate predicates.
@@ -51,25 +51,25 @@ service wiring depends on the screen's needs; `App` remains the shared shell.
 
 Business logic calls [WizardUI](../../../src/ui/wizard-ui.ts) through
 [getUI](../../../src/ui/index.ts). Screens use
-[WizardStore](../../../src/ui/tui/store.ts) setters for reactive changes. The
+[WizardStore](../../../src/tui/store.ts) setters for reactive changes. The
 router resolves program screens from session predicates; overlays interrupt that
 resolution. Local state is appropriate for presentation details such as tab
 selection, not wizard progression.
 
 For new state, first decide whether it belongs in
 [WizardSession](../../../src/lib/wizard-session.ts) or display-only store state.
 Use an explicit setter that notifies subscribers. When business logic needs the
-operation, extend `WizardUI`, [InkUI](../../../src/ui/tui/ink-ui.ts), and
-[LoggingUI](../../../src/ui/logging-ui.ts) together. Reuse existing enums and
+operation, extend `WizardUI`, [InkUI](../../../src/tui/ink-ui.ts), and
+[LoggingUI](../../../src/headless/renderers/logging-ui.ts) together. Reuse existing enums and
 union types rather than introducing competing status vocabularies.
 
 ## Reuse and check
 
-Compose existing primitives and use [styles.ts](../../../src/ui/tui/styles.ts)
+Compose existing primitives and use [styles.ts](../../../src/tui/styles.ts)
 for shared colors, icons, and alignment. Export new public primitives from
-[primitives/index.ts](../../../src/ui/tui/primitives/index.ts), add a realistic
-[playground demo](../../../src/ui/tui/playground/demos/), and register it in
-[PlaygroundApp.tsx](../../../src/ui/tui/playground/PlaygroundApp.tsx).
+[primitives/index.ts](../../../src/tui/primitives/index.ts), add a realistic
+[playground demo](../../../src/tui/playground/demos/), and register it in
+[PlaygroundApp.tsx](../../../src/tui/playground/PlaygroundApp.tsx).
 
 Run `pnpm try --playground` to inspect primitives. Use
 [exploring-the-wizard](../exploring-the-wizard/SKILL.md) when exercising actual

.claude/skills/ink-tui/references/ARCHITECTURE.md

@@ -6,9 +6,9 @@
 | ----------------------------------------------------------------- | ----------------------------------------------------------------------------- |
 | [WizardSession](../../../../src/lib/wizard-session.ts)            | Run configuration, decisions, credentials, and lifecycle state                |
 | [ProgramStep](../../../../src/programs/program-step.ts)       | Screens, visibility/completion predicates, gates, and initialization hooks    |
-| [screen-sequences.ts](../../../../src/ui/tui/screen-sequences.ts) | `ScreenId`, `Screen`, `Sequence`, and the derived `PROGRAM_SEQUENCES`         |
-| [WizardRouter](../../../../src/ui/tui/router.ts)                  | Resolution and the `Overlay` stack                                            |
-| [WizardStore](../../../../src/ui/tui/store.ts)                    | Reactive state, gate promises, display observations, and pending interactions |
+| [screen-sequences.ts](../../../../src/tui/screen-sequences.ts) | `ScreenId`, `Screen`, `Sequence`, and the derived `PROGRAM_SEQUENCES`         |
+| [WizardRouter](../../../../src/tui/router.ts)                  | Resolution and the `Overlay` stack                                            |
+| [WizardStore](../../../../src/tui/store.ts)                    | Reactive state, gate promises, display observations, and pending interactions |
 | [WizardUI](../../../../src/ui/wizard-ui.ts)                       | Typed operations available to business logic                                  |
 
 ## Program screens
@@ -23,7 +23,7 @@ with store gate creation.
 `WizardRouter.resolve(session)` first checks the overlay stack, then returns the
 first visible, incomplete screen. It also handles the failed-authentication
 outro case. Follow this method and the
-[router tests](../../../../src/ui/tui/__tests__/router.test.ts) for exact
+[router tests](../../../../src/tui/__tests__/router.test.ts) for exact
 behavior; there is no program cursor or `next()` API.
 
 The screen sequence is a presentation projection of the program. It is distinct
@@ -40,13 +40,13 @@ Read `ProgramStep` before adding asynchronous work:
   assigned. Reserve it for work independent of that session.
 - `onReady` runs after the real session is assigned and is awaited in order.
 
-[The store](../../../../src/ui/tui/store.ts) derives gate promises from the
+[The store](../../../../src/tui/store.ts) derives gate promises from the
 program. `getGate(stepId)` resolves once: a predicate becoming false later does
 not close it again. A missing gate returns a resolved promise.
 `waitUntil(predicate)` evaluates live state at the await point; use that
 distinction when a decision can change after startup.
 
-[startTUI](../../../../src/ui/tui/start-tui.ts) invokes `runInitHooks` after
+[startTUI](../../../../src/tui/start-tui.ts) invokes `runInitHooks` after
 rendering starts. Merely constructing a store for a test or playground does not
 start those effects.
 
@@ -62,7 +62,7 @@ separate store atoms. Reuse the existing setters (`pushStatus`, `syncTodos`,
 `setEventPlan`) for those updates. Do not mutate session fields behind the store
 after attaching the session.
 
-[InkUI](../../../../src/ui/tui/ink-ui.ts) translates `getUI()` calls into store
+[InkUI](../../../../src/tui/ink-ui.ts) translates `getUI()` calls into store
 operations. Business logic should use this interface rather than import the
 store; screens can use the store directly.
 
@@ -75,10 +75,10 @@ Their cancellation methods settle pending requests and dismiss the corresponding
 overlay. Use the established methods rather than pushing a question overlay
 without its pending state or promise.
 
-Read [WizardAskScreen](../../../../src/ui/tui/screens/WizardAskScreen.tsx),
-[TaskNoticeScreen](../../../../src/ui/tui/screens/TaskNoticeScreen.tsx), and the
+Read [WizardAskScreen](../../../../src/tui/screens/WizardAskScreen.tsx),
+[TaskNoticeScreen](../../../../src/tui/screens/TaskNoticeScreen.tsx), and the
 matching store methods before changing their lifecycle.
-[LoggingUI](../../../../src/ui/logging-ui.ts) rejects question requests,
+[LoggingUI](../../../../src/headless/renderers/logging-ui.ts) rejects question requests,
 declines optional task notices, and leaves the manual-auth-code promise pending;
 it cannot collect terminal input.
 
@@ -89,17 +89,17 @@ actual overlay values from the enum; health checks are program screens.
 
 ## Components and services
 
-[App](../../../../src/ui/tui/App.tsx) creates the service bundle and screen
+[App](../../../../src/tui/App.tsx) creates the service bundle and screen
 registry, then renders
-[ScreenContainer](../../../../src/ui/tui/primitives/ScreenContainer.tsx). The
+[ScreenContainer](../../../../src/tui/primitives/ScreenContainer.tsx). The
 registry injects services where needed, such as the
-[MCP installer](../../../../src/ui/tui/services/mcp-installer.ts). Prefer this
+[MCP installer](../../../../src/tui/services/mcp-installer.ts). Prefer this
 boundary when a screen needs external operations rather than coupling a new
 component to step internals.
 
 `ScreenContainer` owns transitions, shared keyboard hints, viewport handling,
 and
-[ScreenErrorBoundary](../../../../src/ui/tui/primitives/ScreenErrorBoundary.tsx).
+[ScreenErrorBoundary](../../../../src/tui/primitives/ScreenErrorBoundary.tsx).
 The boundary records an error outro and run phase on render failure. When
 changing completion predicates, verify that failure and dismissal remain
 reachable; the boundary does not replace those predicates.

.claude/skills/ink-tui/references/PATTERNS.md

@@ -5,12 +5,12 @@ codebase.
 
 | Task                                                 | Start here                                                                                                                                      |
 | ---------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| Compose a run screen with conditional event-plan tab | [RunScreen](../../../../src/ui/tui/screens/RunScreen.tsx)                                                                                       |
-| Build a program intro                                | [IntroScreenLayout](../../../../src/ui/tui/screens/IntroScreenLayout.tsx)                                                                       |
-| Compose a learning deck                              | [LearnCard](../../../../src/ui/tui/components/LearnCard.tsx), [LearnDeckDemo](../../../../src/ui/tui/playground/demos/LearnDeckDemo.tsx)        |
-| Compare layout primitives                            | [LayoutDemo](../../../../src/ui/tui/playground/demos/LayoutDemo.tsx)                                                                            |
-| Exercise picker and confirmation controls            | [InputDemo](../../../../src/ui/tui/playground/demos/InputDemo.tsx)                                                                              |
-| Add an interaction modal                             | [WizardAskScreen](../../../../src/ui/tui/screens/WizardAskScreen.tsx), [AskModalDemo](../../../../src/ui/tui/playground/demos/AskModalDemo.tsx) |
+| Compose a run screen with conditional event-plan tab | [RunScreen](../../../../src/tui/screens/RunScreen.tsx)                                                                                       |
+| Build a program intro                                | [IntroScreenLayout](../../../../src/tui/screens/IntroScreenLayout.tsx)                                                                       |
+| Compose a learning deck                              | [LearnCard](../../../../src/tui/components/LearnCard.tsx), [LearnDeckDemo](../../../../src/tui/playground/demos/LearnDeckDemo.tsx)        |
+| Compare layout primitives                            | [LayoutDemo](../../../../src/tui/playground/demos/LayoutDemo.tsx)                                                                            |
+| Exercise picker and confirmation controls            | [InputDemo](../../../../src/tui/playground/demos/InputDemo.tsx)                                                                              |
+| Add an interaction modal                             | [WizardAskScreen](../../../../src/tui/screens/WizardAskScreen.tsx), [AskModalDemo](../../../../src/tui/playground/demos/AskModalDemo.tsx) |
 
 ## Keep progression in session state
 
@@ -21,14 +21,14 @@ through its session predicate and explicit setter. Do not create a parallel
 
 ## Keyboard handling
 
-Use [useKeyBindings](../../../../src/ui/tui/hooks/useKeyBindings.ts) for visible
+Use [useKeyBindings](../../../../src/tui/hooks/useKeyBindings.ts) for visible
 shortcuts: it couples handlers to labels in the shared hints bar.
-[KeyboardHintsDemo](../../../../src/ui/tui/playground/demos/KeyboardHintsDemo.tsx)
+[KeyboardHintsDemo](../../../../src/tui/playground/demos/KeyboardHintsDemo.tsx)
 shows the pattern. Reuse its `KeyMatch` vocabulary and choose a distinct
 registration id for each mounted control.
 
 For an ordinary-key dismissal, use
-[useDismissOnAnyKey](../../../../src/ui/tui/hooks/useDismissOnAnyKey.ts). It
+[useDismissOnAnyKey](../../../../src/tui/hooks/useDismissOnAnyKey.ts). It
 ignores Ctrl/Meta combinations so the global Ctrl+T HUD shortcut does not also
 dismiss the screen.
 
@@ -43,7 +43,7 @@ handlers will receive the same key.
 
 Visible text belongs inside Ink `Text`. Reuse the shared color/alignment
 constants and the relevant primitive's border treatment. Use
-[useStdoutDimensions](../../../../src/ui/tui/hooks/useStdoutDimensions.ts) when
+[useStdoutDimensions](../../../../src/tui/hooks/useStdoutDimensions.ts) when
 layout must update on terminal resize; reading `useStdout` alone does not
 subscribe. Account for the shell's title, hints, tabs, status expansion, and
 optional HUD rather than allocating the full terminal height to screen content.