@averyyy/pi-coding-agent 0.84.4-piclient.2 → 0.85.1-piclient.2

package/dist/core/agent-session.js

@@ -74,9 +74,6 @@ function estimateMessagesTokens(messages) {
 // ============================================================================
 const INTRA_TURN_COMPACTION_MARKER_TYPE = "pi:intra-turn-compaction";
 const INTRA_TURN_COMPACTION_MARKER_TEXT = "Continue from the compaction summary above. The previous tool loop was compacted before the next provider request; use the summary's Operational State, file lists, failures, last command, and next steps.";
-const VALIDATION_HINT_MESSAGE_TYPE = "pi:validation-hint";
-const VALIDATION_HINT_FILE_LIMIT = 12;
-const VALIDATION_HINT_FAILURE_CHAR_LIMIT = 1200;
 const AUTO_SESSION_NAME_INPUT_CHAR_LIMIT = 4000;
 const AUTO_SESSION_NAME_MAX_CHARS = 80;
 const AUTO_SESSION_NAME_PROMPT = "Name this coding session from the transcript below. Return only a concise title, in the user's language when clear. No quotes, no markdown, no explanation. Do not call tools.";
@@ -86,12 +83,6 @@ function isPiServerMode() {
 function toProviderReasoning(thinkingLevel) {
     return thinkingLevel === "off" ? undefined : thinkingLevel;
 }
-function getStringField(input, key) {
-    if (!input || typeof input !== "object" || Array.isArray(input))
-        return undefined;
-    const value = input[key];
-    return typeof value === "string" && value.trim().length > 0 ? value : undefined;
-}
 function getPiServerFailurePhase(message) {
     for (const diagnostic of message.diagnostics ?? []) {
         if (diagnostic.type !== "pi_server_failure")
@@ -112,19 +103,6 @@ function getPiServerFailureRetryable(message) {
     }
     return undefined;
 }
-function toolTextContent(content) {
-    return content
-        .filter((part) => part.type === "text")
-        .map((part) => part.text)
-        .join("\n")
-        .trim();
-}
-function compactValidationSummary(text) {
-    const trimmed = text.trim();
-    if (trimmed.length <= VALIDATION_HINT_FAILURE_CHAR_LIMIT)
-        return trimmed;
-    return `...${trimmed.slice(trimmed.length - VALIDATION_HINT_FAILURE_CHAR_LIMIT + 3)}`;
-}
 function messageTextContent(message) {
     if (!("content" in message))
         return "";
@@ -195,8 +173,6 @@ export class AgentSession {
     // Bash execution state
     _bashAbortControllers = new Set();
     _pendingBashMessages = [];
-    _validationModifiedFiles = new Set();
-    _validationFailure = undefined;
     // Extension system
     _extensionRunner;
     _turnIndex = 0;
@@ -320,71 +296,6 @@ export class AgentSession {
             return { model };
         }
     }
-    _resetValidationHintState() {
-        this._validationModifiedFiles.clear();
-        this._validationFailure = undefined;
-    }
-    _recordValidationToolResult(toolName, input, content, isError) {
-        if ((toolName === "edit" || toolName === "write") && !isError) {
-            const path = getStringField(input, "path") ?? getStringField(input, "file_path");
-            if (path) {
-                this._validationModifiedFiles.add(path);
-            }
-            return;
-        }
-        if (toolName !== "bash") {
-            return;
-        }
-        const command = getStringField(input, "command");
-        if (!command) {
-            return;
-        }
-        if (isError) {
-            this._validationFailure = {
-                command,
-                summary: compactValidationSummary(toolTextContent(content)),
-            };
-        }
-        else if (this._validationFailure?.command === command) {
-            this._resetValidationHintState();
-        }
-        else if (!this._validationFailure) {
-            this._validationModifiedFiles.clear();
-        }
-    }
-    _createValidationHintMessage() {
-        const modifiedFiles = Array.from(this._validationModifiedFiles).slice(-VALIDATION_HINT_FILE_LIMIT);
-        if (modifiedFiles.length === 0 && !this._validationFailure) {
-            return undefined;
-        }
-        const lines = ["<validation-hint>"];
-        if (modifiedFiles.length > 0) {
-            lines.push("Recent modified files:", ...modifiedFiles.map((file) => `- ${file}`));
-        }
-        if (this._validationFailure) {
-            lines.push("Recent failed command:", this._validationFailure.command, "Failure summary:", this._validationFailure.summary || "(no output)", "Suggested next validation command:", this._validationFailure.command);
-        }
-        else {
-            lines.push("Suggested next step:", "Run the smallest project validation that covers the modified files.");
-        }
-        lines.push("Inspect failures, fix the root cause, then rerun validation before finalizing.", "</validation-hint>");
-        return {
-            role: "custom",
-            customType: VALIDATION_HINT_MESSAGE_TYPE,
-            content: [{ type: "text", text: lines.join("\n") }],
-            display: false,
-            details: { modifiedFiles, failedCommand: this._validationFailure?.command },
-            timestamp: Date.now(),
-        };
-    }
-    _withValidationHint(context) {
-        const messages = context.messages.filter((message) => !(message.role === "custom" && message.customType === VALIDATION_HINT_MESSAGE_TYPE));
-        const hint = this._createValidationHintMessage();
-        return {
-            ...context,
-            messages: hint ? [...messages, hint] : messages,
-        };
-    }
     /**
      * Install tool hooks once on the Agent instance.
      *
@@ -433,8 +344,6 @@ export class AgentSession {
             const normalizedContent = await normalizeToolResultImages(content, {
                 autoResizeImages: this.settingsManager.getImageAutoResize(),
             });
-            const finalIsError = hookResult?.isError ?? isError;
-            this._recordValidationToolResult(toolCall.name, args, normalizedContent, finalIsError);
             if (!hookResult && normalizedContent === content) {
                 return undefined;
             }
@@ -458,11 +367,11 @@ export class AgentSession {
             const previousContext = previousSnapshot?.context ?? nextTurn.context;
             return {
                 ...previousSnapshot,
-                context: this._withValidationHint({
+                context: {
                     ...previousContext,
                     systemPrompt: this._systemPromptOverride ?? this._baseSystemPrompt,
                     tools: this.agent.state.tools.slice(),
-                }),
+                },
                 model: this.agent.state.model,
                 thinkingLevel: this.agent.state.thinkingLevel,
             };
@@ -498,7 +407,7 @@ export class AgentSession {
         return this._idleWaitPromise;
     }
     _resolveIdleWaitIfIdle() {
-        if (this._isAgentRunActive || !this._resolveIdleWait) {
+        if (!this.isIdle || !this._resolveIdleWait) {
             return;
         }
         const resolve = this._resolveIdleWait;
@@ -834,9 +743,9 @@ export class AgentSession {
     get isStreaming() {
         return this._isAgentRunActive;
     }
-    /** Whether the session has no active agent run, retry, auto-compaction, or queued continuation. */
+    /** Whether the session has no active agent run, compaction, branch summary, retry, or queued continuation. */
     get isIdle() {
-        return !this._isAgentRunActive;
+        return !this._isAgentRunActive && !this.isCompacting;
     }
     /** Current effective system prompt (includes any per-turn extension modifications) */
     get systemPrompt() {
@@ -988,7 +897,6 @@ export class AgentSession {
     // Prompting
     // =========================================================================
     async _runAgentPrompt(messages) {
-        this._resetValidationHintState();
         this._isAgentRunActive = true;
         try {
             await this.agent.prompt(messages);
@@ -1528,6 +1436,8 @@ export class AgentSession {
      */
     async abort() {
         this.abortRetry();
+        this.abortCompaction();
+        this.abortBranchSummary();
         this.agent.abort();
         await this.waitForIdle();
     }
@@ -1784,6 +1694,10 @@ export class AgentSession {
         }
         return compactionResult;
     }
+    _clearManualCompactionState() {
+        this._compactionAbortController = undefined;
+        this._resolveIdleWaitIfIdle();
+    }
     /**
      * Manually compact the session context.
      * Aborts current agent operation first.
@@ -1907,7 +1821,7 @@ export class AgentSession {
                 details,
             };
             // compaction_end listeners may submit queued prompts, so expose idle state before notifying them.
-            this._compactionAbortController = undefined;
+            this._clearManualCompactionState();
             this._emit({
                 type: "compaction_end",
                 reason: "manual",
@@ -1921,18 +1835,20 @@ export class AgentSession {
             const message = error instanceof Error ? error.message : String(error);
             const aborted = message === "Compaction cancelled" || (error instanceof Error && error.name === "AbortError");
             this._compactionAbortController = undefined;
+            const errorMessage = aborted ? undefined : `Compaction failed: ${message}`;
+            this._clearManualCompactionState();
             this._emit({
                 type: "compaction_end",
                 reason: "manual",
                 result: undefined,
                 aborted,
                 willRetry: false,
-                errorMessage: aborted ? undefined : `Compaction failed: ${message}`,
+                errorMessage,
             });
             throw error;
         }
         finally {
-            this._compactionAbortController = undefined;
+            this._clearManualCompactionState();
         }
     }
     /**
@@ -2239,6 +2155,7 @@ export class AgentSession {
         }
         finally {
             this._autoCompactionAbortController = undefined;
+            this._resolveIdleWaitIfIdle();
         }
     }
     /**
@@ -3060,6 +2977,7 @@ export class AgentSession {
         }
         finally {
             this._branchSummaryAbortController = undefined;
+            this._resolveIdleWaitIfIdle();
         }
     }
     /**