chore: address feedback

Author: calvinbrewer

packages/cli/src/bin/stash.ts

@@ -78,8 +78,8 @@ ${messages.cli.usagePrefix}${STASH} <command> [options]
 Commands:
   init                 Initialize CipherStash for your project
   plan                 Draft a reviewable encryption plan at .cipherstash/plan.md
-  impl                 Execute an encryption plan (or implement without one with --continue-without-plan)
-  status               Show project lifecycle: init done? plan written? implementation engaged?
+  impl                 Execute the plan with a local agent
+  status               Displays implementation status
   auth <subcommand>    Authenticate with CipherStash
   wizard               AI-guided encryption setup (reads your codebase)
 
@@ -111,7 +111,7 @@ Init Flags:
   --drizzle            Use Drizzle-specific setup flow
 
 Impl Flags:
-  --continue-without-plan  Skip the planning checkpoint and go straight to implementation
+  --continue-without-plan  Skip planning and go straight to implementation
                            (interactively confirms before proceeding)
 
 DB Flags:

packages/cli/src/commands/impl/index.ts

@@ -9,25 +9,10 @@ import {
   CONTEXT_REL_PATH,
   type ContextFile,
 } from '../init/lib/write-context.js'
-import {
-  CancelledError,
-  type InitProvider,
-  type InitState,
-} from '../init/types.js'
+import { CancelledError, type InitState } from '../init/types.js'
 import { detectPackageManager, runnerCommand } from '../init/utils.js'
 import { howToProceedStep } from './steps/how-to-proceed.js'
 
-/**
- * The handoff steps in `impl/steps/handoff-*.ts` accept an `InitProvider`
- * but ignore it. Stub keeps the type signature happy without pretending
- * impl has provider-specific behaviour.
- */
-const STUB_PROVIDER: InitProvider = {
-  name: 'impl',
-  introMessage: '',
-  getNextSteps: () => [],
-}
-
 function buildStateFromContext(
   ctx: ContextFile,
   agents: AgentEnvironment,
@@ -46,15 +31,14 @@ function buildStateFromContext(
 }
 
 /**
- * Confirm "are you sure?" before implementing without a plan. The
- * default-no on the confirm is the security stance — passing through
- * the planning checkpoint by accident is the failure mode we're guarding
- * against.
+ * Confirm before launching implementation when the user has chosen to
+ * skip the planning checkpoint. Default-no is the security stance —
+ * passing through this prompt by accident is the failure mode we're
+ * guarding against.
  */
 async function confirmContinueWithoutPlan(): Promise<void> {
   const confirmed = await p.confirm({
-    message:
-      'Implementing without a plan commits you to ~45–60 min of agent work. Continue?',
+    message: 'Implementation can take some time. Continue?',
     initialValue: false,
   })
   if (p.isCancel(confirmed) || !confirmed) {
@@ -168,7 +152,7 @@ export async function implCommand(flags: Record<string, boolean>) {
     const agents = detectAgents(cwd, process.env)
     const state = buildStateFromContext(ctx, agents)
 
-    await howToProceedStep.run(state, STUB_PROVIDER)
+    await howToProceedStep.run(state)
 
     p.outro(
       `Implementation handoff complete. Run \`${cli} db status\` to verify state.`,

packages/cli/src/commands/impl/steps/handoff-agents-md.ts

@@ -28,7 +28,7 @@ const AGENTS_MD_REL_PATH = 'AGENTS.md'
 export const handoffAgentsMdStep: InitStep = {
   id: 'handoff-agents-md',
   name: 'Write AGENTS.md',
-  async run(state: InitState, _provider: InitProvider): Promise<InitState> {
+  async run(state: InitState, _provider?: InitProvider): Promise<InitState> {
     const cwd = process.cwd()
     const integration = state.integration ?? 'postgresql'
 

packages/cli/src/commands/impl/steps/handoff-claude.ts

@@ -21,7 +21,7 @@ const CLAUDE_INSTALL_URL = 'https://code.claude.com/docs/en/quickstart'
 export const handoffClaudeStep: InitStep = {
   id: 'handoff-claude',
   name: 'Hand off to Claude Code',
-  async run(state: InitState, _provider: InitProvider): Promise<InitState> {
+  async run(state: InitState, _provider?: InitProvider): Promise<InitState> {
     const cwd = process.cwd()
     const integration = state.integration ?? 'postgresql'
 

packages/cli/src/commands/impl/steps/handoff-codex.ts

@@ -28,7 +28,7 @@ const CODEX_INSTALL_URL = 'https://github.com/openai/codex'
 export const handoffCodexStep: InitStep = {
   id: 'handoff-codex',
   name: 'Hand off to Codex',
-  async run(state: InitState, _provider: InitProvider): Promise<InitState> {
+  async run(state: InitState, _provider?: InitProvider): Promise<InitState> {
     const cwd = process.cwd()
     const integration = state.integration ?? 'postgresql'
 

packages/cli/src/commands/impl/steps/handoff-wizard.ts

@@ -23,7 +23,7 @@ import { runWizardSpawn } from '../../wizard/index.js'
 export const handoffWizardStep: InitStep = {
   id: 'handoff-wizard',
   name: 'Use the CipherStash Agent',
-  async run(state: InitState, _provider: InitProvider): Promise<InitState> {
+  async run(state: InitState, _provider?: InitProvider): Promise<InitState> {
     const cwd = process.cwd()
     const envKeys = state.envKeys ?? []
 

packages/cli/src/commands/impl/steps/how-to-proceed.ts

@@ -82,7 +82,7 @@ export function buildOptions(
 export const howToProceedStep: InitStep = {
   id: 'how-to-proceed',
   name: 'How to proceed',
-  async run(state: InitState, provider: InitProvider): Promise<InitState> {
+  async run(state: InitState, _provider?: InitProvider): Promise<InitState> {
     const mode: InitMode = state.mode ?? 'implement'
     const message =
       mode === 'plan'
@@ -101,13 +101,13 @@ export const howToProceedStep: InitStep = {
 
     switch (choice) {
       case 'claude-code':
-        return handoffClaudeStep.run(next, provider)
+        return handoffClaudeStep.run(next)
       case 'codex':
-        return handoffCodexStep.run(next, provider)
+        return handoffCodexStep.run(next)
       case 'agents-md':
-        return handoffAgentsMdStep.run(next, provider)
+        return handoffAgentsMdStep.run(next)
       case 'wizard':
-        return handoffWizardStep.run(next, provider)
+        return handoffWizardStep.run(next)
     }
   },
 }

packages/cli/src/commands/init/types.ts

@@ -67,7 +67,11 @@ export interface InitState {
 export interface InitStep {
   id: string
   name: string
-  run(state: InitState, provider: InitProvider): Promise<InitState>
+  /** `provider` is optional. The init pipeline passes one (it owns
+   *  intro copy and provider-specific defaults); the post-init handoff
+   *  steps invoked by `stash plan` / `stash impl` don't have a provider
+   *  to give and don't use one. */
+  run(state: InitState, provider?: InitProvider): Promise<InitState>
 }
 
 export interface InitProvider {

packages/cli/src/commands/plan/index.ts

@@ -9,25 +9,9 @@ import {
   CONTEXT_REL_PATH,
   type ContextFile,
 } from '../init/lib/write-context.js'
-import {
-  CancelledError,
-  type InitProvider,
-  type InitState,
-} from '../init/types.js'
+import { CancelledError, type InitState } from '../init/types.js'
 import { detectPackageManager, runnerCommand } from '../init/utils.js'
 
-/**
- * `stash plan` borrows the same handoff machinery as `stash impl`. The
- * handoff steps don't actually use the provider (their `run` signatures
- * take `_provider`); the abstraction is an init-time concept for intro
- * copy. A stub satisfies the type.
- */
-const STUB_PROVIDER: InitProvider = {
-  name: 'plan',
-  introMessage: '',
-  getNextSteps: () => [],
-}
-
 function buildStateFromContext(
   ctx: ContextFile,
   agents: AgentEnvironment,
@@ -82,7 +66,7 @@ export async function planCommand() {
     const agents = detectAgents(cwd, process.env)
     const state = buildStateFromContext(ctx, agents)
 
-    await howToProceedStep.run(state, STUB_PROVIDER)
+    await howToProceedStep.run(state)
 
     // Chain into `stash impl` so the user doesn't have to copy/paste. Lazy
     // import avoids a circular module load — plan and impl both pull from