@deepseek-ai/dsh-plan-mode 0.1.1-rc.2 → 0.1.2-alpha.2

package/lib/types/index.js

@@ -6,12 +6,11 @@
  * policy enforce restrictions independently and do not read or write plan
  * state.
  *
- * The state in force is folded from the session log (`plan/mode`, last one
- * wins), so resume and fork restore it without a live mirror. User selections
- * remain pending until the next accepted in-turn pre-step. The service includes
- * the selected state in the proposed step assembly, then appends `plan/mode`
- * from `agent/pre-step` only when the step is accepted. Same-step request
- * retries reuse their assembly.
+ * The `plan` projection folds the session log, so resume and fork restore the
+ * state. User selections remain pending until the next accepted in-turn
+ * pre-step. The service includes the selected state in the proposed step
+ * assembly, then appends `plan/mode` from `agent/pre-step` only when the step
+ * is accepted. Same-step request retries reuse their assembly.
  *
  * The exit tool remains registered while plan mode is inactive, so entering
  * or leaving plan mode changes only the prompt section, not the request tool
@@ -72,26 +71,6 @@ export function resolveConfig(config) {
     }
     return { section };
 }
-/**
- * Whether plan mode is active after the first `end` events. The last
- * `plan/mode` wins; a prefix with none is inactive.
- *
- * @param events The session log or any prefix of it.
- * @param end Fold `events[0, end)`; defaults to the whole log.
- * @returns Whether plan mode is active.
- */
-export function foldPlanMode(events, end = events.length) {
-    let active = false;
-    let index = 0;
-    for (const event of events) {
-        if (index >= end)
-            break;
-        index++;
-        if (event.type === 'plan/mode')
-            active = event.data.active;
-    }
-    return active;
-}
 const planUnitStateSchema = zod.object({
     active: zod.boolean(),
     wanted: zod.boolean().nullable(),
@@ -99,43 +78,55 @@ const planUnitStateSchema = zod.object({
         commandId: zod.string(),
         wanted: zod.boolean(),
     }).strict().nullable(),
+    activeAtLastHeader: zod.boolean().nullable(),
 }).strict();
 /** Wire payload schema of the `plan` projection. */
 const planProjectionSchema = zod.object({
     active: zod.boolean(),
     pending: zod.boolean(),
 });
-/** Whether the log holds an opened turn without its closing `turn/end`. */
-function hasOpenTurn(events) {
-    let open = false;
-    for (const event of events) {
-        if (event.type === 'turn/start')
-            open = true;
-        else if (event.type === 'turn/end')
-            open = false;
-    }
-    return open;
-}
-/** Plan state at the last logged request header, or `undefined` before the first header. */
-function planModeAtLastHeader(events) {
-    let lastHeader = -1;
-    let index = 0;
-    for (const event of events) {
-        if (event.type === 'request/header')
-            lastHeader = index;
-        index++;
-    }
-    if (lastHeader < 0)
-        return undefined;
-    return foldPlanMode(events, lastHeader + 1);
-}
+/** Projection of logged plan selections and committed mode. */
+export const planProjectionDefinition = {
+    key: 'plan',
+    stateVersion: 3,
+    stateSchema: planUnitStateSchema,
+    init: () => ({ active: false, wanted: null, running: null, activeAtLastHeader: null }),
+    apply: (state, event) => {
+        if (event.type === 'command/run' && event.data.name === 'plan') {
+            if (event.data.args === undefined)
+                return state;
+            const wanted = event.data.args.trim() !== 'off';
+            return { ...state, running: { commandId: event.data.commandId, wanted } };
+        }
+        if (event.type === 'command/done' && event.data.commandId === state.running?.commandId) {
+            const wanted = event.data.kind === 'success' && state.running.wanted !== state.active
+                ? state.running.wanted
+                : null;
+            return { ...state, wanted, running: null };
+        }
+        if (event.type === 'plan/mode') {
+            return { ...state, active: event.data.active, wanted: null };
+        }
+        if (event.type === 'request/header') {
+            return { ...state, activeAtLastHeader: state.active };
+        }
+        return state;
+    },
+    wire: {
+        viewSchema: planProjectionSchema,
+        view: (state) => {
+            const wanted = state.running?.wanted ?? state.wanted;
+            return { active: state.active, pending: wanted !== null && wanted !== state.active };
+        },
+    },
+};
 /**
  * `ctx.planMode`: owns logged plan state, applies and narrates selected state at step start,
  * the `plan:policy` section, the `/plan` command, and the stable exit tool.
- * UIs observe committed flips through `session/event`; there is no live mirror.
+ * Client carriers expose the projection's cropped `{ active, pending }` view.
  */
 export class PlanModeController extends Service {
-    static inject = ['tools', 'systemPrompt'];
+    static inject = ['tools', 'systemPrompt', 'sessionProjections'];
     /** Validated deployment-owned guidance. */
     section;
     /**
@@ -172,55 +163,15 @@ export class PlanModeController extends Service {
         ctx.effect(() => () => { disposed = true; }, 'dsh-plan-mode: close service lifetime');
         ctx.systemPrompt.section({
             name: 'plan:policy',
-            order: 50,
+            order: ctx.systemPrompt.getSectionOrder('PLAN_POLICY'),
             text: (context) => {
                 if (context.agent === undefined)
                     return '';
                 const pending = this.pendingIntents.get(context.agent.session);
-                return (pending?.active ?? foldPlanMode(context.agent.session.events)) ? this.section : '';
+                return (pending?.active ?? this.loggedActive(context.agent.session)) ? this.section : '';
             },
         });
-        // The plan projection unit (session-projection RFC): a pure event fold
-        // serving clients the whole {active, pending} value. `command/run`
-        // records the user's logged /plan selection, its paired `command/done`
-        // keeps only successful selections, and `plan/mode` records that
-        // selection and clears it. Pending is thereby a pure
-        // replay quantity: host restarts, other tabs, and cold reads all recover
-        // it from the log alone. The unit child activates only when a projection
-        // registry is composed (headless assemblies stay unaffected).
-        ctx.inject(['sessionProjections'], (projectionCtx) => {
-            projectionCtx.sessionProjections.register({
-                key: 'plan',
-                stateSchema: planUnitStateSchema,
-                init: () => ({ active: false, wanted: null, running: null }),
-                apply: (state, event) => {
-                    if (event.type === 'command/run' && event.data.name === 'plan') {
-                        if (event.data.args === undefined)
-                            return state;
-                        const wanted = event.data.args.trim() !== 'off';
-                        return { ...state, running: { commandId: event.data.commandId, wanted } };
-                    }
-                    if (event.type === 'command/done' && event.data.commandId === state.running?.commandId) {
-                        const wanted = event.data.kind === 'success' && state.running.wanted !== state.active
-                            ? state.running.wanted
-                            : null;
-                        return { ...state, wanted, running: null };
-                    }
-                    if (event.type === 'plan/mode') {
-                        return { ...state, active: event.data.active, wanted: null };
-                    }
-                    return state;
-                },
-                wire: {
-                    viewSchema: planProjectionSchema,
-                    view: (state) => {
-                        const wanted = state.running?.wanted ?? state.wanted;
-                        return { active: state.active, pending: wanted !== null && wanted !== state.active };
-                    },
-                },
-                stateVersion: 2,
-            });
-        });
+        ctx.sessionProjections.register(planProjectionDefinition);
         // The command child activates only when a command registry is composed.
         ctx.inject(['commands'], (commandCtx) => {
             commandCtx.commands.register({
@@ -244,7 +195,7 @@ export class PlanModeController extends Service {
                                 // Repeat the queued wording while an exit still awaits the
                                 // next accepted pre-step; only a truly inactive session reads
                                 // idempotent.
-                                return foldPlanMode(agent.session.events)
+                                return this.loggedActive(agent.session)
                                     ? { kind: 'success', text: 'Leaving plan mode (applies from the next step).' }
                                     : { kind: 'success', text: 'Plan mode is already inactive.' };
                         }
@@ -288,7 +239,7 @@ export class PlanModeController extends Service {
                 const agent = exec.agent;
                 if (agent === undefined)
                     throw new Error(`${EXIT_PLAN_MODE} requires a calling agent (no session to switch)`);
-                if (!foldPlanMode(agent.session.events)) {
+                if (!this.loggedActive(agent.session)) {
                     throw new Error(`${EXIT_PLAN_MODE} is only available in plan mode`);
                 }
                 if (!/^#\s+\S/.test(args.plan.trim())) {
@@ -359,6 +310,25 @@ export class PlanModeController extends Service {
             }),
         }));
     }
+    loggedActive(session) {
+        return this.planState(session).active;
+    }
+    hasOpenTurn(session) {
+        const state = this.ctx.sessionProjections.stateOf(session, 'turnBoundary');
+        if (state === undefined)
+            throw new Error('plan-mode requires the turnBoundary session projection');
+        return state.openTurnStartSeq !== null;
+    }
+    loggedActiveAtLastHeader(session) {
+        return this.planState(session).activeAtLastHeader ?? undefined;
+    }
+    /** Read the required plan projection state or fail at the first service access. */
+    planState(session) {
+        const state = this.ctx.sessionProjections.stateOf(session, 'plan');
+        if (state === undefined)
+            throw new Error('plan-mode requires the plan session projection');
+        return state;
+    }
     /**
      * Read the logged plan state and any selected state awaiting the next
      * accepted in-turn pre-step.
@@ -367,7 +337,7 @@ export class PlanModeController extends Service {
      * @returns Current logged state plus a pending selection, when present.
      */
     get(agent) {
-        const active = foldPlanMode(agent.session.events);
+        const active = this.loggedActive(agent.session);
         const pending = this.pendingIntents.get(agent.session);
         return pending === undefined ? { active } : { active, pending: pending.active };
     }
@@ -390,16 +360,16 @@ export class PlanModeController extends Service {
     set(agent, active) {
         const session = agent.session;
         const pending = this.pendingIntents.get(session);
-        const target = pending?.active ?? foldPlanMode(session.events);
+        const target = pending?.active ?? this.loggedActive(session);
         if (active === target)
             return 'noop';
-        if (hasOpenTurn(session.events)) {
+        if (this.hasOpenTurn(session)) {
             this.pendingIntents.set(session, { active, narrate: true });
-            return foldPlanMode(session.events) === active ? 'cancelled' : 'queued';
+            return this.loggedActive(session) === active ? 'cancelled' : 'queued';
         }
         // No open turn: commit now. Delete only after append succeeds so a
         // failed durable write leaves the selection retryable, not dropped.
-        if (active === foldPlanMode(session.events)) {
+        if (active === this.loggedActive(session)) {
             this.pendingIntents.delete(session);
             return 'cancelled';
         }
@@ -416,7 +386,7 @@ export class PlanModeController extends Service {
         if (pending === undefined)
             return;
         const target = pending.active;
-        if (target === foldPlanMode(session.events)) {
+        if (target === this.loggedActive(session)) {
             this.pendingIntents.delete(session);
             return;
         }
@@ -427,7 +397,7 @@ export class PlanModeController extends Service {
     }
     /** Build a user-switch notice when the last logged header described the other mode. */
     narration(session, target) {
-        const told = planModeAtLastHeader(session.events);
+        const told = this.loggedActiveAtLastHeader(session);
         if (told === undefined || told === target)
             return;
         const text = target

package/lib/types/types.d.ts

@@ -1,12 +1,13 @@
 /**
  * Pure types of the plan domain: the ONE home of the `plan` projection-key
- * declaration, free of this package's host-side value imports (cordis
- * service, dsh-tools, dsh-agent). Two namespace projections serve it —
- * `./types` for host consumers, `./client` for client aggregates — with zero
- * content duplication.
+ * declaration, free of this package's host-side value imports (cordis,
+ * dsh-tools, dsh-agent). Two namespace projections serve it — `./types` for
+ * host consumers and `./client` for client aggregates — with zero content
+ * duplication.
  *
  * @module @deepseek-ai/dsh-plan-mode/types
  */
+import type { CommandId } from '@deepseek-ai/dsh-commands/brand';
 /**
  * The plan projection's wire value. `active` is the logged state in force
  * (the last `plan/mode`, inactive before the first); `pending` is true while
@@ -19,7 +20,25 @@ export interface PlanProjection {
     active: boolean;
     pending: boolean;
 }
+/** Host state used to derive {@link PlanProjection}. */
+export interface PlanUnitState {
+    /** Logged plan mode. */
+    active: boolean;
+    /** The selection's target mode; null when no selection is outstanding. */
+    wanted: boolean | null;
+    /** The latest plan command awaiting its paired settlement. */
+    running: {
+        commandId: CommandId;
+        wanted: boolean;
+    } | null;
+    /** Active state recorded by the latest `request/header`, or null. */
+    activeAtLastHeader: boolean | null;
+}
 declare module '@deepseek-ai/dsh-session-projection/types' {
+    interface SessionProjectionStateMap {
+        /** Host plan-mode fold state. */
+        plan: PlanUnitState;
+    }
     interface SessionProjectionMap {
         /** Plan collaboration state folded from the plan command lifecycle and `plan/mode` events. */
         plan: PlanProjection;

package/lib/types/types.js

@@ -1,9 +1,9 @@
 /**
  * Pure types of the plan domain: the ONE home of the `plan` projection-key
- * declaration, free of this package's host-side value imports (cordis
- * service, dsh-tools, dsh-agent). Two namespace projections serve it —
- * `./types` for host consumers, `./client` for client aggregates — with zero
- * content duplication.
+ * declaration, free of this package's host-side value imports (cordis,
+ * dsh-tools, dsh-agent). Two namespace projections serve it — `./types` for
+ * host consumers and `./client` for client aggregates — with zero content
+ * duplication.
  *
  * @module @deepseek-ai/dsh-plan-mode/types
  */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@deepseek-ai/dsh-plan-mode",
   "description": "Logged per-agent plan mode with deployment guidance, a direct slash command, and a user-reviewed exit",
-  "version": "0.1.1-rc.2",
+  "version": "0.1.2-alpha.2",
   "publishConfig": {
     "access": "public"
   },
@@ -41,16 +41,16 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "@deepseek-ai/dsh-agent": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-commands": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-session": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-session-projection": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-user-questions": "^0.1.1-rc.2",
-    "@deepseek-ai/cordis": "^4.0.1"
+    "@deepseek-ai/dsh-agent": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-commands": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-invariants": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-session-projection": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-tools": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-user-questions": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.1.2-alpha.2",
+    "@deepseek-ai/cordis": "^4.0.2"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh-commands": {
@@ -61,17 +61,17 @@
     "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-agent": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-agent-loop": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-code-runtime": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-commands": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-session": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-session-projection": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-user-questions": "^0.1.1-rc.2",
-    "@deepseek-ai/cordis": "^4.0.1"
+    "@deepseek-ai/dsh-agent": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-code-runtime": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-commands": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-agent-loop": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-invariants": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-session-projection": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "^0.1.2-alpha.2",
+    "@deepseek-ai/dsh-tools": "^0.1.2-alpha.2",
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-user-questions": "^0.1.2-alpha.2"
   }
 }