@zhushanwen/pi-goal 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-goal",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Codex-style /goal command for Pi — persistent goal-driven autonomous loop with evidence-based completion, token/time budgets, blocked detection, and steering templates.",
   "type": "module",
   "main": "src/index.ts",

package/src/budget.ts

@@ -147,7 +147,7 @@ export function checkProgress(state: GoalRuntimeState, tasksCompletedAtStart: nu
 	return {
 		allTasksDone: totalCount > 0 && incomplete.length === 0 && completedCount > 0,
 		noTasksCreated: totalCount === 0,
-		maxTurnsReached: state.turnCount >= state.budget.maxTurns,
+		maxTurnsReached: state.currentTurnIndex >= state.budget.maxTurns,
 		isStalled: progressThisRound === 0,
 		budgetTight: Boolean(
 			state.budget.tokenBudget &&

package/src/index.ts

@@ -12,7 +12,7 @@
  * 健壮性保障：
  * - goalId snapshot 防止旧回调操作新 goal
  * - 时间累计统一由 persistState 管理，无双写
- * - 防重入保护（hasPendingInjection）
+ * - before_agent_start 注入 context，agent_end 负责 continuation（预算检查/进度评估/续跑）
  * - deserializeState 向后兼容旧格式
  */
 
@@ -159,7 +159,7 @@ async function handleGoalCommand(pi: ExtensionAPI, session: GoalSession, args: s
 			const lines = [
 				`Objective: ${session.state.objective}`,
 				`Status: ${session.state.status}`,
-				`Turn: ${session.state.turnCount}/${session.state.budget.maxTurns}`,
+				`Turn: ${session.state.currentTurnIndex}/${session.state.budget.maxTurns}`,
 				`Tasks: ${completed}/${total} completed`,
 				`Stall turns: ${session.state.stallCount}`,
 				`Time elapsed: ${Math.floor(elapsed / SECONDS_PER_MINUTE)}m${Math.floor(elapsed % SECONDS_PER_MINUTE)}s`,
@@ -306,6 +306,7 @@ Objective: ${session.state.objective}`,
 			session.state.tasks = [];
 			session.state.stallCount = 0;
 			session.state.turnCount = 0;
+			session.state.currentTurnIndex = 0;
 			session.state.lastProgressTurn = 0;
 			session.state.budgetLimitSteeringSent = false;
 			session.state.budgetWarning70Sent = false;
@@ -510,7 +511,7 @@ async function handleAgentEnd(pi: ExtensionAPI, session: GoalSession, ctx: Exten
 		if (checkStale()) return;
 		updateWidget(session, ctx);
 		ctx.ui.notify(
-			`Objective completed ✓ (${getCompletedCount(session.state.tasks)}/${session.state.tasks.length} tasks, ${session.state.turnCount} turns)`,
+			`Objective completed ✓ (${getCompletedCount(session.state.tasks)}/${session.state.tasks.length} tasks, ${session.state.currentTurnIndex} turns)`,
 			"info",
 		);
 		return;
@@ -526,12 +527,6 @@ async function handleAgentEnd(pi: ExtensionAPI, session: GoalSession, ctx: Exten
 
 	if (!isActiveStatus(session.state.status)) return;
 
-	// 防重入
-	if (session.hasPendingInjection) {
-		session.hasPendingInjection = false;
-		return;
-	}
-
 	if (checkStale()) return;
 
 	// ── 预算策略（集中检查）──
@@ -595,7 +590,7 @@ async function handleAgentEnd(pi: ExtensionAPI, session: GoalSession, ctx: Exten
 			if (checkStale()) return;
 			updateWidget(session, ctx);
 			ctx.ui.notify(
-				`All tasks completed, Goal auto-closed. (${progress.completedCount}/${progress.totalCount} tasks, ${session.state.turnCount} turns)`,
+				`All tasks completed, Goal auto-closed. (${progress.completedCount}/${progress.totalCount} tasks, ${session.state.currentTurnIndex} turns)`,
 				"info",
 			);
 			return;
@@ -666,7 +661,7 @@ async function handleAgentEnd(pi: ExtensionAPI, session: GoalSession, ctx: Exten
 		session.state.stallCount++;
 	} else {
 		session.state.stallCount = 0;
-		session.state.lastProgressTurn = session.state.turnCount;
+		session.state.lastProgressTurn = session.state.currentTurnIndex;
 	}
 
 	if (session.state.stallCount >= session.state.budget.maxStallTurns) {

package/src/templates.ts

@@ -42,7 +42,7 @@ export function continuationPrompt(state: GoalRuntimeState): string {
 
 	return (
 		`<goal_context>\n` +
-		`[GOAL] Turn ${state.turnCount}/${state.budget.maxTurns}${budgetLine}${stallLine}\n` +
+		`[GOAL] Turn ${state.currentTurnIndex}/${state.budget.maxTurns}${budgetLine}${stallLine}\n` +
 		`<objective>${objective}</objective>\n` +
 		`${taskLine}\n` +
 		`Rules: create_tasks→update_tasks(evidence)→complete_goal(evidence). blocked→report_blocked(reason). subtask: add_subtasks/update_subtasks (replaces todo tool).\n` +
@@ -117,7 +117,7 @@ export function contextInjectionPrompt(state: GoalRuntimeState): string {
 		`[GOAL mode activated]\n\n` +
 		`<objective>\n${objective}\n</objective>\n` +
 		`Status: ${state.status}\n` +
-		`Turn: ${state.turnCount}/${state.budget.maxTurns}${budgetInfo}\n` +
+		`Turn: ${state.currentTurnIndex}/${state.budget.maxTurns}${budgetInfo}\n` +
 		`Task progress: ${completedCount}/${total}\n\n` +
 		`Strict rules:\n` +
 		`1. First step: call goal_manager's create_tasks to decompose tasks (if not yet created)\n` +
@@ -160,7 +160,7 @@ export function stalenessReminderPrompt(
 	}
 
 	lines.push(`\nObjective: ${objective}`);
-	lines.push(`Turn: ${state.turnCount}/${state.budget.maxTurns}`);
+	lines.push(`Turn: ${state.currentTurnIndex}/${state.budget.maxTurns}`);
 	lines.push("</goal_context>");
 
 	return lines.join("\n");

package/src/tool-handler.ts

@@ -193,7 +193,7 @@ export function makeGoalResult(session: GoalSession, text: string) {
 					meta: {
 						...(state.budget.tokenBudget ? { "Token": `${state.tokensUsed}/${state.budget.tokenBudget}` } : {}),
 						...(state.budget.timeBudgetMinutes ? { "Time": `${Math.floor(getElapsedTimeSeconds(state) / SECONDS_PER_MINUTE)}m/${state.budget.timeBudgetMinutes}m` } : {}),
-						"Turn": `${state.turnCount}/${state.budget.maxTurns}`,
+						"Turn": `${state.currentTurnIndex}/${state.budget.maxTurns}`,
 					},
 				},
 			},
@@ -333,7 +333,7 @@ export async function executeGoalAction(
 			writeGoalHistoryEntry(pi, session);
 			persistGoalState(pi, session, ctx);
 			const budgetReport: string[] = [];
-			budgetReport.push(`Total turns: ${state.turnCount}`);
+			budgetReport.push(`Total turns: ${state.currentTurnIndex}`);
 			budgetReport.push(`Tasks completed: ${getCompletedCount(state.tasks)}/${state.tasks.length}`);
 			if (state.budget.tokenBudget) {
 				budgetReport.push(`Token usage: ${state.tokensUsed}/${state.budget.tokenBudget}`);

package/src/widget.ts

@@ -39,7 +39,7 @@ export function renderStatusLine(state: GoalRuntimeState, th: ThemeLike): string
 	const completedCount = getCompletedCount(state.tasks);
 	const total = state.tasks.length;
 
-	let text = th.fg("accent", `◆ Goal`) + th.fg("muted", ` ${state.turnCount}/${state.budget.maxTurns}`);
+	let text = th.fg("accent", `◆ Goal`) + th.fg("muted", ` ${state.currentTurnIndex}/${state.budget.maxTurns}`);
 
 	if (total > 0) {
 		text += th.fg("muted", ` | ${completedCount}/${total} tasks`);