pi-soly 2.2.7 → 2.3.2

package/mcp/commands.ts

@@ -20,6 +20,7 @@ import { getAuthForUrl } from "./mcp-auth.ts";
 import { notifyReconnectFailed } from "./notify.ts";
 import { loadOnboardingState, markSetupCompleted as persistSetupCompleted, markSharedConfigHintShown } from "./onboarding-state.ts";
 import { openPath } from "./utils.ts";
+import { emit } from "../visual/event-sink.ts";
 
 export async function showStatus(state: McpExtensionState, ctx: ExtensionContext): Promise<void> {
   if (!ctx.hasUI) return;
@@ -70,7 +71,7 @@ export async function showStatus(state: McpExtensionState, ctx: ExtensionContext
     );
   }
 
-  ctx.ui.notify(lines.join("\n"), "info");
+  emit(lines.join("\n"), "info");
 }
 
 export async function showTools(state: McpExtensionState, ctx: ExtensionContext): Promise<void> {
@@ -79,7 +80,7 @@ export async function showTools(state: McpExtensionState, ctx: ExtensionContext)
   const allTools = [...state.toolMetadata.values()].flat().map(m => m.name);
 
   if (allTools.length === 0) {
-    ctx.ui.notify("No MCP tools available", "info");
+    emit("No MCP tools available", "info");
     return;
   }
 
@@ -91,7 +92,7 @@ export async function showTools(state: McpExtensionState, ctx: ExtensionContext)
     `Total: ${allTools.length} tools`,
   ];
 
-  ctx.ui.notify(lines.join("\n"), "info");
+  emit(lines.join("\n"), "info");
 }
 
 export async function reconnectServers(
@@ -101,7 +102,7 @@ export async function reconnectServers(
 ): Promise<void> {
   if (targetServer && !state.config.mcpServers[targetServer]) {
     if (ctx.hasUI) {
-      ctx.ui.notify(`Server "${targetServer}" not found in config`, "error");
+      emit(`Server "${targetServer}" not found in config`, "error");
     }
     return;
   }
@@ -117,7 +118,7 @@ export async function reconnectServers(
       const connection = await state.manager.connect(name, definition);
       if (connection.status === "needs-auth") {
         if (ctx.hasUI) {
-          ctx.ui.notify(`MCP: ${name} requires OAuth. Run /mcp-auth ${name} first.`, "warning");
+          emit(`MCP: ${name} requires OAuth. Run /mcp-auth ${name} first.`, "warning");
         }
         continue;
       }
@@ -129,12 +130,12 @@ export async function reconnectServers(
       state.failureTracker.delete(name);
 
       if (ctx.hasUI) {
-        ctx.ui.notify(
+        emit(
           `MCP: Reconnected to ${name} (${connection.tools.length} tools, ${connection.resources.length} resources)`,
           "info"
         );
         if (failedTools.length > 0) {
-          ctx.ui.notify(`MCP: ${name} - ${failedTools.length} tools skipped`, "warning");
+          emit(`MCP: ${name} - ${failedTools.length} tools skipped`, "warning");
         }
       }
     } catch (error) {
@@ -159,13 +160,13 @@ export async function authenticateServer(
   const definition = config.mcpServers[serverName];
   if (!definition) {
     const message = `Server "${serverName}" not found in config`;
-    ctx.ui.notify(message, "error");
+    emit(message, "error");
     return { ok: false, message };
   }
 
   if (!supportsOAuth(definition)) {
     const message = `Server "${serverName}" does not use OAuth authentication. Set "auth": "oauth" or omit auth for auto-detection.`;
-    ctx.ui.notify(
+    emit(
       `Server "${serverName}" does not use OAuth authentication.\n` +
       `Set "auth": "oauth" or omit auth for auto-detection.`,
       "error"
@@ -175,7 +176,7 @@ export async function authenticateServer(
 
   if (!definition.url) {
     const message = `Server "${serverName}" has no URL configured (OAuth requires HTTP transport)`;
-    ctx.ui.notify(message, "error");
+    emit(message, "error");
     return { ok: false, message };
   }
 
@@ -185,7 +186,7 @@ export async function authenticateServer(
 
     if (status === "authenticated") {
       const message = `OAuth authentication successful for "${serverName}"! Run /mcp reconnect ${serverName} to connect with the new token.`;
-      ctx.ui.notify(
+      emit(
         `OAuth authentication successful for "${serverName}"!\n` +
         `Run /mcp reconnect ${serverName} to connect with the new token.`,
         "info"
@@ -194,11 +195,11 @@ export async function authenticateServer(
     }
 
     const message = `OAuth authentication failed for "${serverName}".`;
-    ctx.ui.notify(message, "error");
+    emit(message, "error");
     return { ok: false, message };
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    ctx.ui.notify(`Failed to authenticate "${serverName}": ${message}`, "error");
+    emit(`Failed to authenticate "${serverName}": ${message}`, "error");
     return { ok: false, message };
   } finally {
     ctx.ui.setStatus("mcp-auth", undefined);
@@ -213,7 +214,7 @@ export async function logoutServer(
   const definition = state.config.mcpServers[serverName];
   if (!definition) {
     const message = `Server "${serverName}" not found in config`;
-    if (ctx.hasUI) ctx.ui.notify(message, "error");
+    if (ctx.hasUI) emit(message, "error");
     return { ok: false, message };
   }
 
@@ -222,7 +223,7 @@ export async function logoutServer(
   updateStatusBar(state);
 
   const message = `OAuth credentials cleared for "${serverName}". Run /mcp-auth ${serverName} to authenticate again.`;
-  if (ctx.hasUI) ctx.ui.notify(message, "info");
+  if (ctx.hasUI) emit(message, "info");
   return { ok: true, message };
 }
 
@@ -376,7 +377,7 @@ export async function openMcpPanel(
           if (!result.cancelled && result.changes.size > 0) {
             writeDirectToolsConfig(result.changes, provenanceMap, config);
             configChanged = true;
-            ctx.ui.notify("Direct tools updated. Pi will reload after this panel closes.", "info");
+            emit("Direct tools updated. Pi will reload after this panel closes.", "info");
           }
           done(undefined);
           resolve();
@@ -404,7 +405,7 @@ export async function openMcpAuthPanel(
   const config = state.config;
   const oauthServers = Object.entries(config.mcpServers).filter(([, definition]) => supportsOAuth(definition));
   if (oauthServers.length === 0) {
-    ctx.ui.notify("No OAuth-capable MCP servers are configured.", "warning");
+    emit("No OAuth-capable MCP servers are configured.", "warning");
     return { configChanged: false };
   }
 

package/mcp/elicitation-handler.ts

@@ -12,6 +12,7 @@ import {
 import { AjvJsonSchemaValidator } from "@modelcontextprotocol/sdk/validation/ajv";
 import type { JsonSchemaType } from "@modelcontextprotocol/sdk/validation/types.js";
 import open from "open";
+import { emit } from "../visual/event-sink.ts";
 
 export type ElicitationValue = string | number | boolean | string[] | undefined;
 type FormProperty = ElicitRequestFormParams["requestedSchema"]["properties"][string];
@@ -104,7 +105,7 @@ async function collectValidField(
       }, { [name]: result.value });
       return result;
     } catch (error) {
-      ui.notify(error instanceof Error ? error.message : String(error), "error");
+      emit(error instanceof Error ? error.message : String(error), "error");
       current = result.value;
     }
   }

package/mcp/index.ts

@@ -14,6 +14,7 @@ import { initializeOAuth, shutdownOAuth } from "./mcp-auth-flow.ts";
 import { createMcpDirectToolCallRenderer, renderMcpProxyToolCall, renderMcpToolResult } from "./tool-result-renderer.ts";
 import { ToolCache, cacheKey as makeCacheKey } from "./tool-cache.ts";
 import { preloadAppBridge } from "./ext-apps-bridge.ts";
+import { emit } from "../visual/event-sink.ts";
 
 /** Default TTL for cached MCP tool results (60s). Tools that hit a stable
  *  server benefit; volatile ones are penalized for 60s — call sites can
@@ -190,12 +191,12 @@ export default function mcpAdapter(pi: ExtensionAPI) {
           state = await initPromise;
         } catch (error) {
           const message = error instanceof Error ? error.message : String(error);
-          if (ctx.hasUI) ctx.ui.notify(`MCP initialization failed: ${message}`, "error");
+          if (ctx.hasUI) emit(`MCP initialization failed: ${message}`, "error");
           return;
         }
       }
       if (!state) {
-        if (ctx.hasUI) ctx.ui.notify("MCP not initialized", "error");
+        if (ctx.hasUI) emit("MCP not initialized", "error");
         return;
       }
 
@@ -222,7 +223,7 @@ export default function mcpAdapter(pi: ExtensionAPI) {
         case "logout": {
           const serverName = rest;
           if (!serverName) {
-            if (ctx.hasUI) ctx.ui.notify("Usage: /mcp logout <server>", "error");
+            if (ctx.hasUI) emit("Usage: /mcp logout <server>", "error");
             return;
           }
           await logoutServer(serverName, state, ctx);
@@ -258,12 +259,12 @@ export default function mcpAdapter(pi: ExtensionAPI) {
           state = await initPromise;
         } catch (error) {
           const message = error instanceof Error ? error.message : String(error);
-          if (ctx.hasUI) ctx.ui.notify(`MCP initialization failed: ${message}`, "error");
+          if (ctx.hasUI) emit(`MCP initialization failed: ${message}`, "error");
           return;
         }
       }
       if (!state) {
-        if (ctx.hasUI) ctx.ui.notify("MCP not initialized", "error");
+        if (ctx.hasUI) emit("MCP not initialized", "error");
         return;
       }
 

package/mcp/init.ts

@@ -22,6 +22,7 @@ import { UiResourceHandler } from "./ui-resource-handler.ts";
 import { openUrl, parallelLimit } from "./utils.ts";
 import { logger } from "./logger.ts";
 import { getMissingConfiguredDirectToolServers } from "./direct-tools.ts";
+import { emit } from "../visual/event-sink.ts";
 import {
 	notifySessionRecovered,
 	notifySessionRecoveryFailed,
@@ -158,7 +159,7 @@ export async function initializeMcp(
   for (const { name, definition, connection, error } of results) {
     if (error || !connection) {
       if (ctx.hasUI) {
-        ctx.ui.notify(`MCP: Failed to connect to ${name}: ${error}`, "error");
+        emit(`MCP: Failed to connect to ${name}: ${error}`, "error");
       }
       console.error(`MCP: Failed to connect to ${name}: ${error}`);
       continue;
@@ -169,7 +170,7 @@ export async function initializeMcp(
     updateMetadataCache(state, name);
 
     if (failedTools.length > 0 && ctx.hasUI) {
-      ctx.ui.notify(
+      emit(
         `MCP: ${name} - ${failedTools.length} tools skipped`,
         "warning"
       );
@@ -183,7 +184,7 @@ export async function initializeMcp(
     const msg = failedCount > 0
       ? `MCP: ${connectedCount}/${startupServers.length} servers connected (${totalTools} tools)`
       : `MCP: ${connectedCount} servers connected (${totalTools} tools)`;
-    ctx.ui.notify(msg, "info");
+    emit(msg, "info");
   }
 
   const envDirect = process.env.MCP_DIRECT_TOOLS;
@@ -215,7 +216,7 @@ export async function initializeMcp(
       );
       const bootstrapped = bootstrapResults.filter(r => r.ok).map(r => r.name);
       if (bootstrapped.length > 0 && ctx.hasUI) {
-        ctx.ui.notify(`MCP: direct tools for ${bootstrapped.join(", ")} will be available after restart`, "info");
+        emit(`MCP: direct tools for ${bootstrapped.join(", ")} will be available after restart`, "info");
       }
     }
   }

package/mcp/notify.ts

@@ -14,6 +14,7 @@
 
 import { notifyFramed, type NotifBg } from "../notification.ts";
 import type { ExtensionUIContext } from "@earendil-works/pi-coding-agent";
+import { emit } from "../visual/event-sink.ts";
 
 const MCP_KEY_PREFIX = "mcp-";
 
@@ -36,7 +37,7 @@ function notifyBox(
 		// with a short title-only message. Don't crash the MCP handler.
 		const plain = lines.length > 0 ? `${title} — ${lines.join(" ")}` : title;
 		try {
-			ui.notify(plain, bg === "toolErrorBg" ? "error" : bg === "toolPendingBg" ? "warning" : "info");
+			emit(plain, bg === "toolErrorBg" ? "error" : bg === "toolPendingBg" ? "warning" : "info");
 		} catch {
 			// no UI at all — silent
 		}

package/notification.ts

@@ -6,7 +6,7 @@
 // soft background — the same pattern pi itself uses for branch summaries
 // and compaction messages (see pi-coding-agent's BranchSummaryMessage).
 //
-// Why a widget, not `ui.notify()`?
+// Why a widget, not `emit()`?
 //   - `notify()` is plain text, no background, no styled box
 //   - `setWidget(key, factory, opts)` accepts a factory returning a
 //     `Box` / `Text` component, which gives full theme support
@@ -29,6 +29,7 @@
 import { Box, Spacer, Text, type TUI } from "@earendil-works/pi-tui";
 import type { ExtensionUIContext, Theme } from "@earendil-works/pi-coding-agent";
 import { appendNotification } from "./notifications-log.ts";
+import { emit } from "./visual/event-sink.ts";
 
 /** Theme background color names (subset of ThemeBg). */
 export type NotifBg =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-soly",
-  "version": "2.2.7",
+  "version": "2.3.2",
   "description": "Workflow + project management for pi-coding-agent. Plans, state, MANDATORY rules, self-review, multi-question picker. One npm install, zero config. LLM drives the workflow inline via the soly_workflow tool — no external subagent plugin.",
   "type": "module",
   "main": "index.ts",

package/visual/chrome.ts

@@ -20,6 +20,7 @@ import { SolyFooter } from "./footer.ts";
 import { SolyTopBar } from "./topbar.ts";
 import { SolyHeader, type WelcomeInput } from "./welcome.ts";
 import { buildWorkingMessage } from "./working.ts";
+import { emit } from "./event-sink.ts";
 
 /** Subset of soly config that controls the chrome (see config.ts `chrome`). */
 export type ChromeConfig = {
@@ -61,6 +62,11 @@ export type Chrome = {
 	updateWorking(ui: ExtensionUIContext, outputTokens: number): void;
 	/** Stop the telemetry line and restore the default message (agent_end). */
 	stopWorking(ui: ExtensionUIContext): void;
+	/** Record a soly event (any level). Rendered as a sub-line under the
+	 *  Working indicator. No popups — everything goes through the sub-line.
+	 *  └─ for info, └─ ⚠ for warning, └─ ✗ for error. Auto-cleared on
+	 *  the next `startWorking`. */
+	emit(text: string, level?: "info" | "warning" | "error"): void;
 	/** Restore pi's native footer/widgets/indicator (session_shutdown / disable). */
 	dispose(ui?: ExtensionUIContext): void;
 };
@@ -98,9 +104,15 @@ export function createChrome(getConfig: () => ChromeConfig): Chrome {
 	};
 
 	return {
+		emit(text: string, level: "info" | "warning" | "error" = "info"): void {
+			data.recentEvent = text;
+			data.recentEventLevel = level;
+			try { tui?.requestRender(); } catch { /* not mounted yet */ }
+		},
+
 		data,
 
-		install(ui): void {
+		install(ui: ExtensionUIContext): void {
 			if (!getConfig().enabled) return;
 			ui.setWorkingIndicator({ frames: getConfig().spinnerFrames, intervalMs: getConfig().spinnerIntervalMs });
 			ui.setFooter((t, theme, footerData) => {
@@ -133,6 +145,10 @@ export function createChrome(getConfig: () => ChromeConfig): Chrome {
 		startWorking(ui): void {
 			if (!getConfig().enabled || !getConfig().telemetry) return;
 			clearWorking();
+			// Each new turn starts with a clean sub-line — old events were
+			// from the previous turn, not relevant to the current one.
+			data.recentEvent = null;
+			data.recentEventLevel = null;
 			working = { ui, startMs: Date.now(), inputTokens: data.ctxTokens ?? 0, outputTokens: 0, timer: null };
 			renderWorking();
 			working.timer = setInterval(renderWorking, 1000);

package/visual/data.ts

@@ -39,6 +39,12 @@ export type ChromeData = {
 	verbLabel: string | null;
 	/** html_artifacts created this session (0 = no segment). */
 	artifactCount: number;
+	/** Most recent non-error soly event (e.g. "reloaded 47 rules"). Rendered
+	 *  as a sub-line under the Working indicator; auto-cleared by the next
+	 *  agent_start. null = no recent event. */
+	recentEvent: string | null;
+	/** Level of the recent event (used for glyph/color). */
+	recentEventLevel: "info" | "warning" | "error" | null;
 };
 
 /** A fresh ChromeData with everything empty/idle. */
@@ -58,5 +64,7 @@ export function emptyChromeData(): ChromeData {
 		phaseLabel: null,
 		verbLabel: null,
 		artifactCount: 0,
+		recentEvent: null,
+		recentEventLevel: null,
 	};
 }

package/visual/event-sink.ts

@@ -0,0 +1,30 @@
+// visual/event-sink.ts — global event sink for soly notifications
+//
+// All soly modules (commands, workflows, mcp, init) route their events
+// through this sink instead of ctx.ui.notify. The sink is set once at
+// session_start by index.ts (wired to chrome.recordEvent). Before it's
+// set, events are silently dropped (no chrome = no UI).
+//
+// Why a module-level global instead of threading `recordEvent` through
+// every function signature? The mcp/ module has 30+ call sites in
+// deeply-nested handlers; threading a new parameter through all of them
+// is pure churn with no architectural benefit — every call would pass
+// the same value. A global sink is the pragmatic choice.
+
+type EventLevel = "info" | "warning" | "error";
+type EventSink = (text: string, level?: EventLevel) => void;
+
+let sink: EventSink | null = null;
+
+/** Wire the event sink to the chrome's recordEvent. Called once at
+ *  session_start. Safe to call multiple times (idempotent). */
+export function setEventSink(fn: EventSink): void {
+	sink = fn;
+}
+
+/** Record a soly event. Routes to chrome.recordEvent if the sink is
+ *  wired (TUI mode); silently drops if not (RPC/print mode or before
+ *  session_start). */
+export function emit(text: string, level: EventLevel = "info"): void {
+	sink?.(text, level);
+}

package/visual/footer.ts

@@ -124,6 +124,24 @@ export class SolyFooter implements Component {
 	}
 
 	render(width: number): string[] {
-		return [buildFooterLine(this.data, this.fd, width, { ascii: this.getAscii(), styler: themeStyler(this.theme) })];
+		const out: string[] = [buildFooterLine(this.data, this.fd, width, { ascii: this.getAscii(), styler: themeStyler(this.theme) })];
+		const event = this.data.recentEvent;
+		if (event) {
+			const styler = themeStyler(this.theme);
+			const level = this.data.recentEventLevel;
+			let glyph = "└─";
+			let styled: string;
+			if (level === "error") {
+				glyph = "└─ ✗";
+				styled = styler.fg("error", `${glyph} ${event}`);
+			} else if (level === "warning") {
+				glyph = "└─ ⚠";
+				styled = styler.fg("warning", `${glyph} ${event}`);
+			} else {
+				styled = styler.dim(`${glyph} ${event}`);
+			}
+			out.push("    " + styled);
+		}
+		return out;
 	}
 }

package/workflows/done.ts

@@ -95,7 +95,7 @@ export function buildDoneTransform(
 	if ("error" in parsed) {
 		return reply(`soly done: ${parsed.error}\n\nUsage: soly done <slug> OR soly done <prefix>/<slug>`);
 	}
-	const { name, prefix } = parsed;
+	const { name, prefix, autoSlugified, originalInput } = parsed;
 	const effectivePrefix = prefix ?? opts.defaultBranchPrefix ?? "";
 	const branchName = effectivePrefix ? `${effectivePrefix}/${name}` : name;
 

package/workflows/index.ts

@@ -30,8 +30,10 @@ import { createVerifyLoop, type VerifyState } from "./verify.ts";
 import type { ContextManager } from "../context-manager.ts";
 import type { SolyState } from "../core.js";
 import type { SolyConfig } from "../config.js";
+import { emit } from "../visual/event-sink.ts";
 
 export interface WorkflowsDeps {
+	recordEvent: (text: string, level?: "info" | "warning") => void;
 	getState: () => SolyState;
 	/** List of rule relPaths marked `interactive: true` — inlined into the
 	 *  execute instruction so the model knows which rules are explicitly out of
@@ -57,7 +59,7 @@ export interface WorkflowsDeps {
 const MODE_VERBS: readonly string[] = ["execute", "plan", "discuss", "resume"];
 
 export function registerWorkflows(pi: ExtensionAPI, deps: WorkflowsDeps): void {
-	const { getState, getInteractiveRules, getActiveTools, getConfig, onWorkflowUsed } = deps;
+	const { getState, getInteractiveRules, getActiveTools, getConfig, onWorkflowUsed, recordEvent } = deps;
 
 	// Self-review loop ("soly verify"). Owns its own agent_end + input hooks;
 	// fresh-context mode rewrites the next LLM call through the context manager.
@@ -276,10 +278,10 @@ State inspection lives on the slash form — \`/soly <sub>\`:
 				"and .agents/.continue-here.md. Preserve milestone/phase/plan position and key " +
 				"decisions in the summary. Drop implementation-detail noise.",
 			onComplete: () => {
-				ctx.ui.notify("soly: session compacted. Use `soly resume` to pick up.", "info");
+				emit("session compacted — use 'soly resume' to pick up");
 			},
 			onError: (err) => {
-				ctx.ui.notify(`soly: compact failed — ${err.message}`, "error");
+				emit(`soly: compact failed — ${err.message}`, "error");
 			},
 		});
 	});

package/workflows/inspect.ts

@@ -9,6 +9,7 @@ import * as path from "node:path";
 import { solyDirFor } from "../core.js";
 import type { SolyState } from "../core.js";
 import type { SolyConfig } from "../config.js";
+import { emit } from "../visual/event-sink.ts";
 
 interface InspectUI {
 	notify: (text: string, kind?: "info" | "warning" | "error") => void;
@@ -282,7 +283,7 @@ export function showTodos(
 	ui: InspectUI,
 ): void {
 	if (!state.exists) {
-		ui.notify("soly todos: no .agents/ directory in cwd", "error");
+		emit("soly todos: no .agents/ directory in cwd", "error");
 		return;
 	}
 	const file = findTodosFile(state.solyDir);
@@ -294,7 +295,7 @@ export function showTodos(
 	try {
 		parsed = JSON.parse(fs.readFileSync(file, "utf-8"));
 	} catch {
-		ui.notify(`soly todos: failed to parse ${path.basename(file)} (corrupt JSON?)`, "error");
+		emit(`soly todos: failed to parse ${path.basename(file)} (corrupt JSON?)`, "error");
 		return;
 	}
 	if (!parsed || !Array.isArray(parsed.todos) || parsed.todos.length === 0) {
@@ -327,7 +328,7 @@ export function showIterations(
 	limitDefault: number = 10,
 ): void {
 	if (!state.exists) {
-		ui.notify("soly iterations: no .agents/ directory in cwd", "error");
+		emit("soly iterations: no .agents/ directory in cwd", "error");
 		return;
 	}
 	const iterDir = path.join(state.solyDir, "iterations");
@@ -342,7 +343,7 @@ export function showIterations(
 	if (nArg) {
 		const parsed = parseInt(nArg, 10);
 		if (!Number.isFinite(parsed) || parsed <= 0) {
-			ui.notify(`soly iterations: invalid count "${nArg}"`, "error");
+			emit(`soly iterations: invalid count "${nArg}"`, "error");
 			return;
 		}
 		limit = parsed;
@@ -396,12 +397,12 @@ export function showDiffIterations(
 	ui: InspectUI,
 ): void {
 	if (!state.exists) {
-		ui.notify("soly diff iterations: no .agents/ directory in cwd", "error");
+		emit("soly diff iterations: no .agents/ directory in cwd", "error");
 		return;
 	}
 	const iterDir = path.join(state.solyDir, "iterations");
 	if (cmd.args.length < 2) {
-		ui.notify(
+		emit(
 			`soly diff iterations: need two file arguments (e.g. "soly diff iterations 05-02-exec-T1.md 05-02-exec-T2.md")`,
 			"error",
 		);
@@ -412,11 +413,11 @@ export function showDiffIterations(
 	const pathB = path.isAbsolute(b) ? b : path.join(iterDir, b);
 
 	if (!fs.existsSync(pathA)) {
-		ui.notify(`soly diff iterations: file not found: ${a}`, "error");
+		emit(`soly diff iterations: file not found: ${a}`, "error");
 		return;
 	}
 	if (!fs.existsSync(pathB)) {
-		ui.notify(`soly diff iterations: file not found: ${b}`, "error");
+		emit(`soly diff iterations: file not found: ${b}`, "error");
 		return;
 	}
 
@@ -454,23 +455,23 @@ export function showPhaseDelete(
 	ui: InspectUI,
 ): void {
 	if (!state.exists) {
-		ui.notify("soly phase delete: no .agents/ directory in cwd", "error");
+		emit("soly phase delete: no .agents/ directory in cwd", "error");
 		return;
 	}
 	if (cmd.args.length < 1) {
-		ui.notify("soly phase delete: need a phase number (e.g. `soly phase delete 5`)", "error");
+		emit("soly phase delete: need a phase number (e.g. `soly phase delete 5`)", "error");
 		return;
 	}
 	const phaseNum = parseInt(cmd.args[0]!, 10);
 	if (!Number.isFinite(phaseNum)) {
-		ui.notify(`soly phase delete: invalid phase number "${cmd.args[0]}"`, "error");
+		emit(`soly phase delete: invalid phase number "${cmd.args[0]}"`, "error");
 		return;
 	}
 
 	const phase = state.phases.find((p) => p.number === phaseNum);
 	if (!phase) {
 		const known = state.phases.map((p) => p.number).join(", ") || "(none)";
-		ui.notify(`soly phase delete: phase ${phaseNum} not found. Known: ${known}`, "error");
+		emit(`soly phase delete: phase ${phaseNum} not found. Known: ${known}`, "error");
 		return;
 	}
 
@@ -482,7 +483,7 @@ export function showPhaseDelete(
 		fs.mkdirSync(trashDir, { recursive: true });
 		fs.renameSync(phase.dir, dest);
 	} catch (e) {
-		ui.notify(`soly phase delete: failed to move phase (${(e as Error).message})`, "error");
+		emit(`soly phase delete: failed to move phase (${(e as Error).message})`, "error");
 		return;
 	}
 

package/workflows/new.ts

@@ -18,6 +18,7 @@ import * as fs from "node:fs";
 import { execFileSync } from "node:child_process";
 import { parsePlanName, type SolyCommand } from "./parser.ts";
 import type { SolyState } from "../core.js";
+import { emit } from "../visual/event-sink.ts";
 
 export interface NewResult {
 	handled: boolean;
@@ -89,7 +90,7 @@ export function buildNewTransform(
 	const parsed = parsePlanName(cmd.args.join(" "));
 	if ("error" in parsed) return reply(`soly new: ${parsed.error}`);
 
-	const { name, prefix } = parsed;
+	const { name, prefix, autoSlugified, originalInput } = parsed;
 	// Branch can be one of three shapes:
 	//   - "feature/statistic-preparation" (user typed <prefix>/<slug>)
 	//   - "feature/statistic-preparation" (config has defaultBranchPrefix "feature", user typed "statistic-preparation")
@@ -123,18 +124,45 @@ export function buildNewTransform(
 
 	const currentBranch = git(["branch", "--show-current"], { cwd: projectRoot }) || "HEAD (detached)";
 	// A plan branch is a kebab-case slug (no `<type>/` prefix after 1.15.x).
-	// The branch can also be the long-lived integration branches `master`
-	// or `main`. Anything else (release tags, weird suffixes) → user must
-	// checkout first.
+	// The base can also be the long-lived integration branches `master`/`main`.
+	// Anything else (release tags, weird suffixes, feature branches from
+	// previous work) — we auto-checkout the base branch instead of
+	// blocking the user. The LLM driving soly shouldn't have to manage
+	// git state.
 	if (
 		currentBranch !== "master" &&
 		currentBranch !== "main" &&
 		!/^[a-z0-9][a-z0-9-]*[a-z0-9]$/.test(currentBranch)
 	) {
-		return reply(
-			`soly new: currently on "${currentBranch}" (not master/main, not a soly plan branch). ` +
-				`Switch back to master first with \`git checkout master\`.`,
-		);
+		// Detect which base branch the repo uses: try `main` first, fall
+		// back to `master`. If neither exists, give up — the repo is in
+		// a state the user needs to resolve by hand.
+		const baseBranch = ["main", "master"].find((b) => {
+			try {
+				git(["rev-parse", "--verify", b], { cwd: projectRoot });
+				return true;
+			} catch {
+				return false;
+			}
+		});
+		if (!baseBranch) {
+			return reply(
+				`soly new: cannot find a base branch to base off — repo has neither "main" nor "master". ` +
+					`Run \`git checkout <base>\` first, or create a default branch.`,
+			);
+		}
+		try {
+			git(["checkout", baseBranch], { cwd: projectRoot });
+			emit(
+				`auto-checkout ${baseBranch} (was on ${currentBranch})`,
+				"info",
+			);
+		} catch (err) {
+			const msg = err instanceof Error ? err.message : String(err);
+			return reply(
+				`soly new: failed to checkout ${baseBranch} (was on ${currentBranch}): ${msg}`,
+			);
+		}
 	}
 
 	let branchExisted = false;