@dreki-gg/pi-plan-mode 0.26.1 → 0.27.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @dreki-gg/pi-plan-mode
 
+## 0.27.0
+
+### Minor Changes
+
+- Plan mode no longer overrides the model or thinking level. Entering plan mode,
+  starting execution, and session restore all keep whatever model and thinking
+  level the user had active. The forced executor model picker is also removed.
+  Additionally, plan mode now auto-exits after the agent submits a plan or
+  initiative, returning the user to normal mode immediately.
+
+## 0.26.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @dreki-gg/taskman@0.3.0
+
 ## 0.26.1
 
 ### Patch Changes

package/extensions/plan-mode/constants.ts

@@ -41,18 +41,5 @@ export const EXEC_TOOLS = [
   'reconcile_plans',
 ];
 
-// ── Model + thinking presets ─────────────────────────────────────────────────
-export const PLAN_MODEL = { provider: 'anthropic', id: 'claude-opus-4-6' } as const;
-export const PLAN_THINKING = 'medium' as const;
-
-export const EXEC_MODEL = { provider: 'openai', id: 'gpt-5.5' } as const;
-export const EXEC_THINKING = 'low' as const;
-
 // ── Exec-pending marker file name ────────────────────────────────────────────
 export const EXEC_PENDING_FILE = '.exec-pending.json';
-
-// ── Execution model picker options ───────────────────────────────────────────
-export const EXEC_MODEL_OPTIONS: { label: string; model: { provider: string; id: string } }[] = [
-  { label: 'gpt-5.5', model: { provider: 'openai', id: 'gpt-5.5' } },
-  { label: 'claude-opus-4-6', model: { provider: 'anthropic', id: 'claude-opus-4-6' } },
-];

package/extensions/plan-mode/index.ts

@@ -21,12 +21,8 @@ import { Key } from '@earendil-works/pi-tui';
 import {
   PLAN_TOOLS,
   EXEC_TOOLS,
-  PLAN_MODEL,
-  PLAN_THINKING,
-  EXEC_MODEL,
-  EXEC_THINKING,
 } from './constants.js';
-import type { ThinkingLevel, TaskStatus } from './types.js';
+import type { TaskStatus } from './types.js';
 import { PlanModeState } from './state.js';
 import { makePlanRuntime } from '@dreki-gg/taskman';
 import { loadHandoff } from '@dreki-gg/taskman';
@@ -524,11 +520,10 @@ export default function planMode(pi: ExtensionAPI): void {
           { triggerTurn: false },
         );
 
-        const { previousModel: dpm, previousThinking: dpt } = state;
+        const { previousModel: dpm } = state;
         state.exitPreservingPlan();
         pi.setActiveTools(EXEC_TOOLS);
         if (dpm) await switchModel(pi, ctx, dpm);
-        if (dpt) pi.setThinkingLevel(dpt);
         updateUI(state, ctx);
         state.persist(pi);
         return;
@@ -587,11 +582,10 @@ export default function planMode(pi: ExtensionAPI): void {
           { triggerTurn: false },
         );
 
-        const { previousModel: pm, previousThinking: pt } = state;
+        const { previousModel: pm } = state;
         state.reset();
         pi.setActiveTools(EXEC_TOOLS);
         if (pm) await switchModel(pi, ctx, pm);
-        if (pt) pi.setThinkingLevel(pt);
         updateUI(state, ctx);
         state.persist(pi);
         return;
@@ -599,8 +593,11 @@ export default function planMode(pi: ExtensionAPI): void {
       return;
     }
 
-    // Plan submitted — user can /plan-exec or type naturally.
-    // No menu needed: plan.jsonl + HANDOFF.md are the source of truth.
+    // Auto-exit plan mode after plan/initiative submission so the user
+    // returns to normal mode with their original model.
+    if (state.planEnabled) {
+      await exitPlanMode(state, pi, ctx);
+    }
   });
 
   // ── Event: session restore ────────────────────────────────────────────────
@@ -636,7 +633,7 @@ export default function planMode(pi: ExtensionAPI): void {
         state.planEnabled = false;
         pi.setActiveTools(EXEC_TOOLS);
         await switchModel(pi, ctx, pending.config.model);
-        pi.setThinkingLevel(pending.config.thinking as ThinkingLevel);
+
         updateUI(state, ctx);
         state.persist(pi);
         return;
@@ -651,15 +648,11 @@ export default function planMode(pi: ExtensionAPI): void {
       await resolveActivePlan(state, pi, runPlanIO);
     }
 
-    // Apply tool restrictions, model, and thinking level
+    // Apply tool restrictions (no model/thinking override — keep user's settings)
     if (state.planEnabled) {
       pi.setActiveTools(PLAN_TOOLS);
-      await switchModel(pi, ctx, PLAN_MODEL);
-      pi.setThinkingLevel(PLAN_THINKING);
     } else if (state.executing) {
       pi.setActiveTools(EXEC_TOOLS);
-      await switchModel(pi, ctx, EXEC_MODEL);
-      pi.setThinkingLevel(EXEC_THINKING);
     }
 
     updateUI(state, ctx);

package/extensions/plan-mode/phase-transitions.ts

@@ -4,14 +4,9 @@
 
 import type { ExtensionAPI, ExtensionContext } from '@earendil-works/pi-coding-agent';
 import type { PlanModeState } from './state.js';
-import type { ThinkingLevel } from './types.js';
 import {
   PLAN_TOOLS,
   EXEC_TOOLS,
-  PLAN_MODEL,
-  PLAN_THINKING,
-  EXEC_MODEL,
-  EXEC_THINKING,
 } from './constants.js';
 import { updateUI } from './ui.js';
 
@@ -42,12 +37,9 @@ export async function enterPlanMode(
   state.executing = false;
   state.planDir = undefined;
   state.plan = undefined;
-  state.previousThinking = pi.getThinkingLevel() as ThinkingLevel;
   state.previousModel = ctx.model ? { provider: ctx.model.provider, id: ctx.model.id } : undefined;
   pi.setActiveTools(PLAN_TOOLS);
-  await switchModel(pi, ctx, PLAN_MODEL);
-  pi.setThinkingLevel(PLAN_THINKING);
-  ctx.ui.notify(`Plan mode ON — ${PLAN_MODEL.provider}/${PLAN_MODEL.id}:${PLAN_THINKING}`, 'info');
+  ctx.ui.notify('Plan mode ON', 'info');
   updateUI(state, ctx);
   state.persist(pi);
 }
@@ -57,16 +49,13 @@ export async function exitPlanMode(
   pi: ExtensionAPI,
   ctx: ExtensionContext,
 ): Promise<void> {
-  const { previousModel, previousThinking } = state;
+  const { previousModel } = state;
   state.exitPreservingPlan();
   pi.setActiveTools(EXEC_TOOLS);
   if (previousModel) {
     await switchModel(pi, ctx, previousModel);
   }
-  if (previousThinking) {
-    pi.setThinkingLevel(previousThinking);
-  }
-  ctx.ui.notify('Plan mode OFF — original model restored', 'info');
+  ctx.ui.notify('Plan mode OFF', 'info');
   updateUI(state, ctx);
   state.persist(pi);
 }
@@ -80,12 +69,7 @@ export async function startExecution(
   state.executing = true;
   state.executionStartIdx = ctx.sessionManager.getEntries().length;
   pi.setActiveTools(EXEC_TOOLS);
-  await switchModel(pi, ctx, EXEC_MODEL);
-  pi.setThinkingLevel(EXEC_THINKING);
-  ctx.ui.notify(
-    `Executing plan — ${EXEC_MODEL.provider}/${EXEC_MODEL.id}:${EXEC_THINKING}`,
-    'info',
-  );
+  ctx.ui.notify('Executing plan', 'info');
   updateUI(state, ctx);
   state.persist(pi);
 }

package/extensions/plan-mode/resume.ts

@@ -4,13 +4,12 @@
 
 import type {
   ExtensionAPI,
-  ExtensionContext,
   ExtensionCommandContext,
 } from '@earendil-works/pi-coding-agent';
 import type { PlanModeState } from './state.js';
 import type { PlanData } from './types.js';
 import type { RunPlanIO } from '@dreki-gg/taskman';
-import { EXEC_THINKING, EXEC_MODEL_OPTIONS } from './constants.js';
+
 import { readPlansManifest } from '@dreki-gg/taskman';
 import { loadHandoff } from '@dreki-gg/taskman';
 import { writeExecPending } from './exec-pending.js';
@@ -18,15 +17,6 @@ import { readTasksJsonl, writeTasksJsonl } from '@dreki-gg/taskman';
 import { enterPlanMode } from './phase-transitions.js';
 import { reactivateForExecution } from '@dreki-gg/taskman';
 
-export async function pickExecutionModel(
-  ctx: ExtensionContext,
-): Promise<{ provider: string; id: string } | undefined> {
-  const labels = EXEC_MODEL_OPTIONS.map((o) => o.label);
-  const choice = await ctx.ui.select('Execute with:', labels);
-  if (!choice) return undefined;
-  return EXEC_MODEL_OPTIONS.find((o) => o.label === choice)?.model;
-}
-
 export async function executeInNewSession(
   ctx: ExtensionCommandContext,
   runPlanIO: RunPlanIO,
@@ -34,10 +24,12 @@ export async function executeInNewSession(
   _planData: PlanData,
   kickoff: string,
 ): Promise<void> {
-  const selectedModel = await pickExecutionModel(ctx);
-  if (!selectedModel) return;
+  // Use the current model for execution — no forced model override.
+  const currentModel = ctx.model
+    ? { provider: ctx.model.provider, id: ctx.model.id }
+    : { provider: 'anthropic', id: 'claude-sonnet-4-20250514' };
 
-  await runPlanIO(writeExecPending(dir, { model: selectedModel, thinking: EXEC_THINKING }));
+  await runPlanIO(writeExecPending(dir, { model: currentModel, thinking: 'low' }));
   const parentSession = ctx.sessionManager.getSessionFile();
 
   await ctx.newSession({

package/extensions/plan-mode/state.ts

@@ -3,7 +3,7 @@
  */
 
 import type { ExtensionAPI } from '@earendil-works/pi-coding-agent';
-import type { PlanData, PersistedState, ThinkingLevel } from './types.js';
+import type { PlanData, PersistedState } from './types.js';
 
 export class PlanModeState {
   planEnabled = false;
@@ -11,7 +11,6 @@ export class PlanModeState {
   planDir: string | undefined;
   plan: PlanData | undefined;
   executionStartIdx: number | undefined;
-  previousThinking: ThinkingLevel | undefined;
   previousModel: { provider: string; id: string } | undefined;
 
   persist(pi: ExtensionAPI): void {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreki-gg/pi-plan-mode",
-  "version": "0.26.1",
+  "version": "0.27.0",
   "description": "Two-phase planning workflow for pi — plan with claude-opus-4-6:medium, execute with gpt-5.5:low, with .plans/ file-based handoff",
   "keywords": [
     "pi-package"
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@dreki-gg/pi-command-sandbox": "^0.3.0",
-    "@dreki-gg/taskman": "^0.2.0",
+    "@dreki-gg/taskman": "^0.3.0",
     "effect": "^3.21.2"
   },
   "devDependencies": {