@dreki-gg/pi-plan-mode 0.16.0 → 0.17.1

package/extensions/plan-mode/tools/submit-plan.ts

@@ -5,10 +5,11 @@
 import type { ExtensionAPI } from '@earendil-works/pi-coding-agent';
 import { Text } from '@earendil-works/pi-tui';
 import { Type } from 'typebox';
-import { mkdir } from 'node:fs/promises';
+import { Effect } from 'effect';
 import { saveHandoff } from '../storage/plan-storage.js';
 import { writeTasksJsonl } from '../storage/task-storage.js';
 import { upsertPlanEntry } from '../storage/plans-manifest.js';
+import type { RunPlanIO } from '../effects/runtime.js';
 import { toKebabCase } from '../utils.js';
 import type { PlanData, TaskMeta, TaskRecord } from '../types.js';
 
@@ -16,14 +17,16 @@ export interface SubmitPlanCallbacks {
   onPlanSubmitted: (planDir: string, plan: PlanData) => void;
 }
 
-export function registerSubmitPlanTool(pi: ExtensionAPI, callbacks: SubmitPlanCallbacks): void {
+export function registerSubmitPlanTool(
+  pi: ExtensionAPI,
+  runPlanIO: RunPlanIO,
+  callbacks: SubmitPlanCallbacks,
+): void {
   pi.registerTool({
     name: 'submit_plan',
     label: 'Submit Plan',
-    description:
-      'Finalize a conversational plan with task IDs, JSONL storage, and HANDOFF.md.',
-    promptSnippet:
-      'Finalize the plan with title, handoff, tasks, and dependencies',
+    description: 'Finalize a conversational plan with task IDs, JSONL storage, and HANDOFF.md.',
+    promptSnippet: 'Finalize the plan with title, handoff, tasks, and dependencies',
     promptGuidelines: [
       'Only call submit_plan after shared understanding has been reached with the user.',
       'Each task needs an id like t-001, a short description, and optional depends_on task IDs.',
@@ -78,10 +81,13 @@ export function registerSubmitPlanTool(pi: ExtensionAPI, callbacks: SubmitPlanCa
       }));
       const plan: PlanData = { title: params.title, planName, handoff: params.handoff, tasks };
 
-      await mkdir(planDir, { recursive: true });
-      await writeTasksJsonl(planDir, meta, tasks);
-      await saveHandoff(planDir, params.handoff);
-      await upsertPlanEntry(planName, { status: 'in-progress', title: params.title });
+      await runPlanIO(
+        Effect.gen(function* () {
+          yield* writeTasksJsonl(planDir, meta, tasks);
+          yield* saveHandoff(planDir, params.handoff);
+          yield* upsertPlanEntry(planName, { status: 'in-progress', title: params.title });
+        }),
+      );
 
       callbacks.onPlanSubmitted(planDir, plan);
 
@@ -93,7 +99,6 @@ export function registerSubmitPlanTool(pi: ExtensionAPI, callbacks: SubmitPlanCa
           },
         ],
         details: { planDir, plan },
-        terminate: true,
       };
     },
 

package/extensions/plan-mode/types.ts

@@ -2,7 +2,10 @@
  * Shared types for plan mode.
  */
 
-export type TaskStatus = 'pending' | 'done' | 'skipped' | 'blocked';
+export type TaskStatus = 'pending' | 'done' | 'skipped' | 'blocked' | 'deferred';
+
+/** Where a task came from: the original submitted plan, or discovered during execution. */
+export type TaskOrigin = 'plan' | 'discovered';
 
 export interface TaskRecord {
   _type: 'task';
@@ -10,6 +13,8 @@ export interface TaskRecord {
   description: string;
   details?: string;
   status: TaskStatus;
+  /** Defaults to 'plan' when absent (back-compat with older tasks.jsonl files). */
+  origin?: TaskOrigin;
   depends_on?: string[];
   notes?: string;
   created_at: string;
@@ -45,40 +50,5 @@ export interface PersistedState {
   executionStartIdx: number | undefined;
 }
 
-const TASK_STATUSES = new Set<TaskStatus>(['pending', 'done', 'skipped', 'blocked']);
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null;
-}
-
-function isStringArray(value: unknown): value is string[] {
-  return Array.isArray(value) && value.every((item) => typeof item === 'string');
-}
-
-export function isTaskRecord(value: unknown): value is TaskRecord {
-  if (!isRecord(value)) return false;
-
-  return (
-    value._type === 'task' &&
-    typeof value.id === 'string' &&
-    typeof value.description === 'string' &&
-    (value.details === undefined || typeof value.details === 'string') &&
-    typeof value.status === 'string' &&
-    TASK_STATUSES.has(value.status as TaskStatus) &&
-    (value.depends_on === undefined || isStringArray(value.depends_on)) &&
-    (value.notes === undefined || typeof value.notes === 'string') &&
-    typeof value.created_at === 'string' &&
-    typeof value.updated_at === 'string'
-  );
-}
-
-export function isTaskMeta(value: unknown): value is TaskMeta {
-  if (!isRecord(value)) return false;
-
-  return (
-    value._type === 'meta' &&
-    typeof value.title === 'string' &&
-    typeof value.plan_name === 'string' &&
-    typeof value.created_at === 'string'
-  );
-}
+// Record validation lives in `schema.ts` (Effect Schema). The interfaces above
+// remain the mutable shapes used by the imperative orchestration code.

package/extensions/plan-mode/utils.ts

@@ -42,3 +42,23 @@ export function toKebabCase(name: string): string {
     .replace(/^-+|-+$/g, '')
     .slice(0, 60);
 }
+
+/**
+ * Generate the next sequential task id (`t-NNN`) given existing ids.
+ *
+ * Uses the max numeric suffix of `t-<digits>` ids + 1, zero-padded to 3.
+ * Falls back to `t-<count+1>` when no ids match the pattern.
+ */
+export function nextTaskId(existingIds: readonly string[]): string {
+  let max = 0;
+  let matched = false;
+  for (const id of existingIds) {
+    const m = /^t-(\d+)$/.exec(id);
+    if (!m) continue;
+    matched = true;
+    const n = Number.parseInt(m[1], 10);
+    if (n > max) max = n;
+  }
+  const next = matched ? max + 1 : existingIds.length + 1;
+  return `t-${String(next).padStart(3, '0')}`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreki-gg/pi-plan-mode",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "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,6 +41,7 @@
   },
   "dependencies": {
     "@dreki-gg/pi-command-sandbox": "^0.3.0",
+    "effect": "^3.21.2",
     "pug": "^3.0.3"
   },
   "devDependencies": {

package/extensions/plan-mode/__tests__/types.test.ts

@@ -1,70 +0,0 @@
-import { describe, expect, test } from 'bun:test';
-import { isTaskMeta, isTaskRecord } from '../types.js';
-
-const now = '2026-05-27T12:00:00.000Z';
-
-describe('task record type guards', () => {
-  test('accepts valid task records', () => {
-    expect(
-      isTaskRecord({
-        _type: 'task',
-        id: 't-001',
-        description: 'Do work',
-        details: 'Full instructions',
-        status: 'pending',
-        depends_on: ['t-000'],
-        notes: 'note',
-        created_at: now,
-        updated_at: now,
-      }),
-    ).toBe(true);
-  });
-
-  test('accepts task records without details (lightweight checklist)', () => {
-    expect(
-      isTaskRecord({
-        _type: 'task',
-        id: 't-001',
-        description: 'Do work',
-        status: 'pending',
-        created_at: now,
-        updated_at: now,
-      }),
-    ).toBe(true);
-  });
-
-  test('rejects malformed task records', () => {
-    expect(isTaskRecord({ _type: 'task', id: 't-001', status: 'pending' })).toBe(false);
-    expect(
-      isTaskRecord({
-        _type: 'task',
-        id: 't-001',
-        description: 'Do work',
-        details: 'Full instructions',
-        status: 'unknown',
-        created_at: now,
-        updated_at: now,
-      }),
-    ).toBe(false);
-  });
-});
-
-describe('task meta type guard', () => {
-  test('accepts valid meta records', () => {
-    expect(
-      isTaskMeta({
-        _type: 'meta',
-        title: 'Refactor',
-        plan_name: 'refactor',
-        created_at: now,
-      }),
-    ).toBe(true);
-  });
-
-  test('rejects malformed meta records', () => {
-    expect(isTaskMeta({ _type: 'meta', title: 'Refactor' })).toBe(false);
-    expect(
-      isTaskMeta({ _type: 'task', title: 'Refactor', plan_name: 'refactor', created_at: now }),
-    ).toBe(false);
-  });
-});