@astrosheep/pi-goal-next 0.1.2 → 0.1.4

package/README.md

@@ -61,7 +61,7 @@ The prompt text is copied byte-for-byte from Codex Goal (`continuation.md`, `bud
 
 ## Limits and accounting
 
-- The default maximum is 25 continuation turns (`maxContinuations`). Change it with `/goal turns N`.
+- The default maximum is 25 continuation turns (`maxContinuations`) per run. Change it with `/goal turns N`. `/goal resume` resets the run's continuation count and immediately schedules work when idle. It preserves the objective, journal history, cumulative usage, and token budget. If the token budget is exhausted or the continuation allowance is zero, resume reports the limit instead of claiming success.
 - A token budget is unset by default. Set one at creation with `/goal --tokens N[k|M] ...` or later with `/goal budget N`.
 - Usage is attributed by message entry id, separately for assistant and tool-result messages. Duplicate entry ids are ignored.
 - Missing provider usage is recorded as unknown, never treated as confirmed zero.

package/docs/architecture.md

@@ -88,7 +88,7 @@ The blocked audit is prompt-level only: the runtime does not count blocking turn
 
 `/goal` or `/goal status` · `/goal [--tokens N[k|M]] <objective>` (create; refuses while unfinished) · `/goal edit <objective>` · `/goal pause` · `/goal resume` · `/goal clear` · `/goal budget <tokens|none>` · `/goal turns <max-continuations>`.
 
-A successful `create` or `resume` calls `continuation.onSettled()` so an idle session starts pursuing immediately (Codex starts the turn directly). A successful `edit` sends `objectiveUpdatedPrompt(goal)` with `triggerTurn: true`; `pause` and `clear` send nothing (the active-status check stops continuation).
+A successful `resume` atomically journals `resetContinuations: true` on the user transition to active, resetting the run's continuation count while preserving the objective, usage, budget, and historical entries. It also accepts an already-active goal. Exhausted token budgets and zero continuation allowances are reported without resuming. A successful `create` or `resume` calls `continuation.onSettled()` so an idle session starts pursuing immediately (Codex starts the turn directly). A successful `edit` sends `objectiveUpdatedPrompt(goal)` with `triggerTurn: true`; `pause` and `clear` send nothing (the active-status check stops continuation).
 
 ## Defaults
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/pi-goal-next",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Persistent autonomous goals for pi, with Codex-verbatim goal semantics: continuation prompts, self-audited completion, budgets, and CAS-journaled state.",
   "type": "module",
   "files": [

package/src/commands.ts

@@ -49,7 +49,13 @@ export function registerGoalCommands(piLike: CommandPiLike, deps: CommandDeps):
         case "clear": return finish(await goalCommit.commit({ type: "clear" }, revision), "Goal cleared.");
         case "pause": return finish(await goalCommit.commit({ type: "transition", to: "paused", by: "user", userRequest: '"/goal pause"' }, revision), "Goal paused.");
         case "resume": {
-          const r = await goalCommit.commit({ type: "transition", to: "active", by: "user" }, revision);
+          if (!current) return "Cannot resume: no goal exists.";
+          const goal = current.goal;
+          if (goal.status === "complete") return "Cannot resume: goal is complete.";
+          const used = goal.usage.input + goal.usage.output + goal.usage.cacheRead + goal.usage.cacheWrite;
+          if (goal.tokenBudget !== null && used >= goal.tokenBudget) return "Cannot resume: token budget exhausted. Adjust /goal budget first; cumulative usage is preserved.";
+          if (goal.maxContinuations === 0) return "Cannot resume: continuation allowance is zero. Adjust /goal turns first.";
+          const r = await goalCommit.commit({ type: "transition", to: "active", by: "user", resetContinuations: true }, revision);
           if (r.kind === "ok") await deps.kick();
           return r.kind === "ok" ? "Goal resumed." : "Goal update failed.";
         }

package/src/goal-commit.ts

@@ -39,7 +39,7 @@ export function createGoalCommit(store: GoalStore) {
     switch (intent.type) {
       case "create": return { type: "goal.created", version: 1, seq, goal: next! };
       case "clear": return { type: "goal.cleared", version: 1, seq };
-      case "transition": return { type: "goal.transition", version: 1, seq, from: previous!.status, to: intent.to, by: intent.by, ...(intent.userRequest ? { userRequest: intent.userRequest } : {}) };
+      case "transition": return { type: "goal.transition", version: 1, seq, from: previous!.status, to: intent.to, by: intent.by, ...(intent.userRequest ? { userRequest: intent.userRequest } : {}), ...(intent.resetContinuations ? { resetContinuations: true } : {}) };
       case "usage": return { type: "goal.usage", version: 1, seq, input: intent.input ?? null, output: intent.output ?? null, cacheRead: intent.cacheRead ?? null, cacheWrite: intent.cacheWrite ?? null, unknownMessages: intent.unknownMessages ?? 0 };
       case "continuation_sent": return { type: "goal.continuation_sent", version: 1, seq, generation: intent.generation };
       case "stale_turn": return { type: "goal.stale_turn", version: 1, seq, generation: intent.generation };

package/src/goal.ts

@@ -7,7 +7,7 @@ export type Goal = {
 };
 export type Entry =
   | { type: "goal.created"; version: 1; seq: number; goal: Goal }
-  | { type: "goal.transition"; version: 1; seq: number; from: Status; to: Status; by: Actor; userRequest?: string }
+  | { type: "goal.transition"; version: 1; seq: number; from: Status; to: Status; by: Actor; userRequest?: string; resetContinuations?: boolean }
   | { type: "goal.cleared"; version: 1; seq: number }
   | { type: "goal.usage"; version: 1; seq: number; input: number | null; output: number | null; cacheRead: number | null; cacheWrite: number | null; unknownMessages: number }
   | { type: "goal.continuation_sent"; version: 1; seq: number; generation: number }
@@ -15,7 +15,7 @@ export type Entry =
   | { type: "goal.limit_config"; version: 1; seq: number; tokenBudget: number | null; maxContinuations: number };
 export type Intent =
   | { type: "create"; id: string; objective: string; tokenBudget?: number | null; maxContinuations?: number }
-  | { type: "transition"; to: Status; by: Actor; userRequest?: string }
+  | { type: "transition"; to: Status; by: Actor; userRequest?: string; resetContinuations?: boolean }
   | { type: "clear" }
   | { type: "usage"; input?: number | null; output?: number | null; cacheRead?: number | null; cacheWrite?: number | null; unknownMessages?: number }
   | { type: "continuation_sent"; generation: number }
@@ -55,8 +55,11 @@ export function transition(state: Goal | null, intent: Intent): Goal | null {
     if (intent.to === "paused" && !intent.userRequest?.trim()) throw new GoalError("forbidden", "paused requires user request evidence");
     if (intent.by === "agent" && !["complete", "blocked"].includes(intent.to)) throw new GoalError("forbidden", "agent cannot set this status");
     if (intent.by === "agent" && intent.to === "complete" && state.status !== "active") throw new GoalError("forbidden", "agent can complete only an active goal");
-    if (state.status === "complete" || intent.to === state.status) throw new GoalError("illegal", "illegal status transition");
-    return { ...state, status: intent.to };
+    const reset = intent.resetContinuations === true;
+    if (reset && (intent.by !== "user" || intent.to !== "active")) throw new GoalError("forbidden", "only user resume can reset continuations");
+    if (reset && state.tokenBudget !== null && usageKeys.reduce((sum, key) => sum + state.usage[key], 0) >= state.tokenBudget) throw new GoalError("budget", "token budget exhausted; adjust /goal budget before resuming");
+    if (state.status === "complete" || (intent.to === state.status && !reset)) throw new GoalError("illegal", "illegal status transition");
+    return { ...state, status: intent.to, ...(reset ? { continuationSeq: 0 } : {}) };
   }
   if (intent.type === "limit_config") {
     if (!Number.isInteger(intent.maxContinuations) || intent.maxContinuations < 0 || (intent.tokenBudget !== null && (!Number.isFinite(intent.tokenBudget) || intent.tokenBudget < 0))) throw new GoalError("invalid", "invalid limits");
@@ -95,7 +98,7 @@ export function fold(entries: readonly Entry[]): Goal | null {
     if (!entry.type.startsWith("goal.")) continue;
     if (entry.type === "goal.created") state = { ...entry.goal };
     else if (entry.type === "goal.cleared") state = null;
-    else if (state && entry.type === "goal.transition") state = transition(state, { type: "transition", to: entry.to, by: entry.by, userRequest: entry.userRequest });
+    else if (state && entry.type === "goal.transition") state = transition(state, { type: "transition", to: entry.to, by: entry.by, userRequest: entry.userRequest, resetContinuations: entry.resetContinuations });
     else if (state && entry.type === "goal.limit_config") state = transition(state, { type: "limit_config", tokenBudget: entry.tokenBudget, maxContinuations: entry.maxContinuations });
     else if (state && entry.type === "goal.continuation_sent") state = transition(state, { type: "continuation_sent", generation: entry.generation });
     else if (state && entry.type === "goal.usage") state = transition(state, { type: "usage", input: entry.input, output: entry.output, cacheRead: entry.cacheRead, cacheWrite: entry.cacheWrite, unknownMessages: entry.unknownMessages });

package/src/lifecycle.ts

@@ -29,7 +29,7 @@ function messageFromEvent(event: any, ctx: any): Message | null {
     return m?.role === message.role;
   });
   const m = candidate?.message ?? candidate ?? message;
-  const entryId = m?.id ?? m?.entryId ?? message.id ?? message.entryId;
+  const entryId = candidate?.id ?? candidate?.entryId ?? m?.id ?? m?.entryId ?? message.id ?? message.entryId;
   // Entry identity is heuristic-by-position because branch entries may omit message ids.
   return typeof entryId === "string"
     ? { entryId, role: message.role, usage: m?.usage ?? message.usage, toolName: m?.toolName ?? message.toolName, stopReason: m?.stopReason ?? message.stopReason }
@@ -95,6 +95,9 @@ export function registerLifecycle(pi: PiEvents, deps: LifecycleDeps): void {
     await before(ctx);
     const snapshot = deps.goalCommit.current();
     if (!snapshot) { steeredGoalId = null; steered = false; return; }
+    // Cancellation gates every automatic send, including budget-limit steering.
+    if (lastAssistantStop === "error" || lastAssistantStop === "aborted") return;
+    if (snapshot.goal.status !== "active" && snapshot.goal.status !== "budget_limited") return;
     const verdict = deps.accounting.settleTurn(snapshot.goal);
     if (verdict.kind !== "ok") {
       const latest = deps.goalCommit.current();
@@ -108,8 +111,6 @@ export function registerLifecycle(pi: PiEvents, deps: LifecycleDeps): void {
       steered = true;
       deps.send({ customType: "pi-goal-next/budget_limit", content: budgetLimitPrompt(goal), display: false, details: { goalId: goal.id } }, { triggerTurn: true });
     }
-    // Error/aborted turns produced no completed work; only continue after a normally-finished turn (Codex parity).
-    if (lastAssistantStop === "error" || lastAssistantStop === "aborted") return;
     await deps.continuation.onSettled();
   });
   pi.on("message_start", async (event: MessageStartEvent, ctx: any) => { await before(ctx); await deps.continuation.onMessageStart(event?.message ?? event); });