@dreb/coding-agent 2.60.0 → 2.61.0

package/README.md

@@ -175,7 +175,7 @@ Type `/` in the editor to trigger commands. [Extensions](#extensions) can regist
 | `/name <name>` | Set session display name |
 | `/session` | Show session info (path, tokens, cost) |
 | `/tree` | Jump to any point in the session and continue from there |
-| `/fork` | Create a new session from the current branch |
+| `/fork` | Branch a new session from any user or assistant message (assistant = continue from that answer, user = rewind and re-ask) |
 | `/compact [prompt]` | Manually compact context, optional custom instructions |
 | `/copy` | Open multi-select message picker to copy any messages to clipboard. Assistant reasoning is excluded by default and offered as a separate, selectable `Thinking` row. |
 | `/dream` | Consolidate and prune memories — backs up, merges duplicates, scans sessions for patterns |
@@ -243,7 +243,7 @@ dreb --fork <path>       # Fork specific session file or ID into a new session
 - Filter modes (Ctrl+O): default → no-tools → user-only → labeled-only → all
 - Press `L` (Shift+L) to label entries as bookmarks
 
-**`/fork`** - Create a new session file from the current branch. Opens a selector, copies history up to the selected point, and places that message in the editor for modification.
+**`/fork`** - Create a new session file by branching from any point in the current conversation. Opens a selector listing every user and assistant message: picking an **assistant** message keeps that response and everything before it (continue from that answer) with an empty editor; picking a **user** message rewinds to before it (dropping it and everything after) and places its text in the editor for re-asking.
 
 **`--fork <path|id>`** - Fork an existing session file or partial session UUID directly from the CLI. This copies the full source session into a new session file in the current project.
 
@@ -319,7 +319,7 @@ A trusted root permits lazy loading for that existing directory and all of its d
 
 Replace the default system prompt with `.dreb/SYSTEM.md` (project) or `~/.dreb/agent/SYSTEM.md` (global). Append without replacing via `APPEND_SYSTEM.md`.
 
-For persistent instructions that apply only to one exact provider/model pair, use `modelSettings` in `settings.json` with a canonical key such as `openai-codex/gpt-5.6-sol`. Set `systemPrompt` to replace dreb's built-in prompt or `appendSystemPrompt` to append instructions. The same mechanism works for local/custom models registered in `models.json`, and the prompt updates immediately when the model changes. Explicit session replacements (`--system-prompt`, `SYSTEM.md`, or SDK hooks) take precedence. See [Model settings](docs/settings.md#modelsettings).
+For persistent instructions that apply only to one exact provider/model pair, set `systemPrompt` to replace dreb's built-in prompt or `appendSystemPrompt` to append instructions. Put the field directly on a custom `models[]` entry or built-in `modelOverrides` entry in `models.json`, or use `modelSettings` in `settings.json` with a canonical key such as `openai-codex/gpt-5.6-sol`. Configure prompt behavior in only one file for a canonical model: dreb fails loudly instead of applying implicit precedence when both files declare it. Prompt changes apply when the model changes, and `/reload` picks up edits from either file. Explicit session replacements (`--system-prompt`, `SYSTEM.md`, or SDK hooks) take precedence over model replacement; model append instructions still follow the selected base. See [Custom models](docs/models.md#model-configuration) and [Model settings](docs/settings.md#modelsettings).
 
 ---
 

package/dist/core/agent-session.d.ts

@@ -431,6 +431,7 @@ export declare class AgentSession {
     getFilteredSkills(): import("./skills.js").Skill[];
     /** @deprecated Use getFilteredSkills() instead */
     private _getFilteredSkills;
+    private _resolveModelPromptSettings;
     private _rebuildSystemPrompt;
     /**
      * Send a prompt to the agent.
@@ -563,7 +564,7 @@ export declare class AgentSession {
      * resolves identically to how createAgentSession seeds it at startup.
      */
     private _refreshThinkingDisplay;
-    /** Reject malformed target-model prompt settings before a model switch mutates session state. */
+    /** Reject malformed or conflicting target-model prompt settings before mutating session state. */
     private _validateModelPromptSettings;
     /**
      * Cycle to next/previous model.
@@ -721,18 +722,29 @@ export declare class AgentSession {
      */
     setSessionName(name: string): void;
     /**
-     * Create a fork from a specific entry.
+     * Create a fork from a specific entry. The fork point may be any user or
+     * assistant message in the transcript; branch semantics depend on the role:
+     *
+     * - **Assistant message** -> the new branch *includes* the selected response
+     *   (and everything before it); no editor pre-fill. "Continue from this answer."
+     *   Forking at the last assistant message keeps the entire current state.
+     * - **User message** -> rewind to *before* the selected message (branch from its
+     *   parent, dropping the message and everything after it) and offer its text as
+     *   editor pre-fill. "Edit / re-ask this question."
+     *
      * Emits before_fork/fork session events to extensions.
      *
-     * @param entryId ID of the entry to fork from
+     * @param entryId ID of the message entry to fork from
      * @returns Object with:
-     *   - selectedText: The text of the selected user message (for editor pre-fill)
+     *   - selectedText: The selected user message text for editor pre-fill (empty
+     *     when forking at an assistant message).
      *   - cancelled: True if an extension cancelled the fork
      */
     fork(entryId: string): Promise<{
         selectedText: string;
         cancelled: boolean;
     }>;
+    private _performFork;
     /**
      * Navigate to a different node in the session tree.
      * Unlike fork() which creates a new session file, this stays in the same file.
@@ -756,13 +768,43 @@ export declare class AgentSession {
         summaryEntry?: BranchSummaryEntry;
     }>;
     /**
-     * Get all user messages from session for fork selector.
+     * Get all forkable messages (user *and* assistant) for the fork selector.
+     *
+     * Each entry carries its role so callers can label it and choose the right
+     * fork semantics (assistant = continue-from-answer, user = rewind + re-ask).
+     * A forkable assistant turn with no renderable text (e.g. a thinking-only
+     * turn) still appears as a fork point, with a generic label.
+     *
+     * Assistant turns that cannot be safely branched from (interrupted turns, or
+     * turns containing a tool call whose result lives in a descendant entry) are
+     * excluded — see _isForkableAssistant.
      */
-    getUserMessagesForForking(): Array<{
+    getForkableMessages(): Array<{
         entryId: string;
         text: string;
+        role: "user" | "assistant";
     }>;
-    private _extractUserMessageText;
+    /**
+     * Whether an assistant turn can be safely used as a fork point.
+     *
+     * Forking anchors on the entry's ancestors only (SessionManager.getBranch
+     * walks parentId upward), and errored/aborted turns are dropped by
+     * transformMessages() before every request. Two kinds of assistant turn
+     * therefore produce a branch that silently does NOT match what was selected:
+     *
+     * - stopReason "error"/"aborted": transformMessages() skips the turn, so the
+     *   reply vanishes from context on the next request (defeating "continue from
+     *   this answer", and risking back-to-back user messages on strict providers).
+     * - turns containing tool calls: their tool results are *descendant* entries a
+     *   branch cannot include, so transformMessages() substitutes a fabricated
+     *   "No result provided" (isError) result — telling the model a successful
+     *   tool call failed.
+     *
+     * A completed answer (the intended "continue from here" target) has a terminal
+     * stopReason and no unresolved tool calls, so it passes.
+     */
+    private _isForkableAssistant;
+    private _extractMessageText;
     /**
      * Get session statistics.
      */