omegon 0.7.7 → 0.8.0

package/extensions/cleave/dispatcher.ts

@@ -294,7 +294,7 @@ export function buildChildPrompt(
 		"   - Fill in Summary, Artifacts, Decisions Made, Interfaces Published",
 		"3. **Commits**: Commit your work with clear messages. Do not push.",
 		"4. **No side effects**: Do not install global packages or modify system state.",
-		"5. **Verification**: Run tests or checks and report results in the Verification section.",
+		"5. **Testing**: Write tests for new functions and changed behavior in co-located *.test.ts files. Run them and report results in the Verification section. Untested code is incomplete.",
 		`6. **Workspace**: ${workspacePath}`,
 	];
 

package/extensions/cleave/index.ts

@@ -19,8 +19,8 @@ import { truncateTail, DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize } from "
 
 import { Text } from "@styrene-lab/pi-tui";
 import { Type } from "@sinclair/typebox";
-import { spawn, execFile } from "node:child_process";
-import { registerCleaveProc, deregisterCleaveProc, killCleaveProc, killAllCleaveSubprocesses, cleanupOrphanedProcesses } from "./subprocess-tracker.ts";
+import { execFile } from "node:child_process";
+import { killAllCleaveSubprocesses, cleanupOrphanedProcesses } from "./subprocess-tracker.ts";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { promisify } from "node:util";
@@ -32,7 +32,7 @@ import { debug } from "../lib/debug.ts";
 import { emitOpenSpecState } from "../openspec/dashboard-state.ts";
 import { getSharedBridge, buildSlashCommandResult, parseBridgedArgs } from "../lib/slash-command-bridge.ts";
 import { buildAssessBridgeResult } from "./bridge.ts";
-import { resolveOmegonSubprocess } from "../lib/omegon-subprocess.ts";
+
 import { scanDesignDocs, getNodeSections } from "../design-tree/tree.ts";
 import {
 	assessDirective,
@@ -659,29 +659,6 @@ function normalizeSpecAssessment(payload: AssessSpecAgentResult, expectedTotal:
 	};
 }
 
-function extractJsonObject(text: string): string | null {
-	const fenced = text.match(/```json\s*([\s\S]*?)```/i);
-	if (fenced?.[1]) return fenced[1].trim();
-	const firstBrace = text.indexOf("{");
-	const lastBrace = text.lastIndexOf("}");
-	if (firstBrace === -1 || lastBrace === -1 || lastBrace <= firstBrace) return null;
-	return text.slice(firstBrace, lastBrace + 1).trim();
-}
-
-function extractAssistantText(content: unknown): string {
-	if (typeof content === "string") return content.trim();
-	if (!Array.isArray(content)) return "";
-	return content
-		.map((item) => {
-			if (typeof item === "string") return item;
-			if (!item || typeof item !== "object") return "";
-			return typeof (item as { text?: unknown }).text === "string"
-				? (item as { text: string }).text
-				: "";
-		})
-		.join("\n")
-		.trim();
-}
 
 function formatSpecOutcomeLabel(outcome: AssessLifecycleOutcome): string {
 	switch (outcome) {
@@ -721,151 +698,6 @@ function buildSpecAssessmentHumanText(changeName: string, assessed: AssessSpecAg
 	return lines.join("\n");
 }
 
-async function runSpecAssessmentSubprocess(
-	input: SpecAssessmentRunnerInput,
-): Promise<SpecAssessmentRunnerOutput> {
-	const prompt = [
-		"You are performing a read-only OpenSpec compliance assessment.",
-		"Operate in read-only plan mode. Never call edit, write, or any workspace-mutating command.",
-		"Inspect the repository and determine whether the implementation satisfies every OpenSpec scenario below.",
-		"Return ONLY a JSON object with this exact shape:",
-		"{",
-		'  "summary": { "total": number, "pass": number, "fail": number, "unclear": number },',
-		'  "scenarios": [',
-		'    { "domain": string, "requirement": string, "scenario": string, "status": "PASS"|"FAIL"|"UNCLEAR", "evidence": string[], "notes"?: string }',
-		"  ],",
-		'  "changedFiles": string[],',
-		'  "constraints": string[],',
-		'  "overallNotes"?: string',
-		"}",
-		"Rules:",
-		`- Emit exactly ${input.expectedScenarioCount} scenario entries.`,
-		"- Use FAIL when the code clearly contradicts or omits the scenario.",
-		"- Use UNCLEAR only when code inspection cannot safely prove PASS or FAIL.",
-		"- Evidence must cite concrete files, symbols, or line references when possible.",
-		"- changedFiles should list files that would need modification if the result reopens work.",
-		"- constraints should list newly discovered implementation constraints.",
-		"- Do not wrap the JSON in explanatory prose.",
-		"",
-		`Change: ${input.changeName}`,
-		"",
-		"## Acceptance Criteria",
-		"",
-		input.scenarioText,
-		"",
-		...input.designContext,
-		...input.apiContractContext,
-		...(input.diffContent ? ["### Recent Changes", "", "```diff", input.diffContent, "```", ""] : []),
-	].join("\n");
-
-	const omegon = resolveOmegonSubprocess();
-	const args = [...omegon.argvPrefix, "--mode", "json", "--plan", "-p", "--no-session"];
-	if (input.modelId) args.push("--model", input.modelId);
-
-	return await new Promise<SpecAssessmentRunnerOutput>((resolve, reject) => {
-		const proc = spawn(omegon.command, args, {
-			cwd: input.repoPath,
-			shell: false,
-			stdio: ["pipe", "pipe", "pipe"],
-			detached: true,
-			env: {
-				...process.env,
-				PI_CHILD: "1",
-				TERM: process.env.TERM ?? "dumb",
-			},
-		});
-		registerCleaveProc(proc);
-		let stdout = "";
-		let stderr = "";
-		let buffer = "";
-		let assistantText = "";
-		let settled = false;
-		const settleReject = (error: Error) => {
-			if (settled) return;
-			settled = true;
-			clearTimeout(timer);
-			reject(error);
-		};
-		const settleResolve = (value: SpecAssessmentRunnerOutput) => {
-			if (settled) return;
-			settled = true;
-			clearTimeout(timer);
-			resolve(value);
-		};
-		let escalationTimer: ReturnType<typeof setTimeout> | undefined;
-		const timer = setTimeout(() => {
-			killCleaveProc(proc);
-			escalationTimer = setTimeout(() => {
-				if (!proc.killed) {
-					try {
-						if (proc.pid) process.kill(-proc.pid, "SIGKILL");
-					} catch {
-						try { proc.kill("SIGKILL"); } catch { /* already dead */ }
-					}
-				}
-			}, 5_000);
-			settleReject(new Error(`Timed out after 120s while assessing ${input.changeName}.`));
-		}, 120_000);
-
-		const processLine = (line: string) => {
-			if (!line.trim()) return;
-			stdout += line + "\n";
-			let event: unknown;
-			try {
-				event = JSON.parse(line);
-			} catch {
-				return;
-			}
-			if (!event || typeof event !== "object") return;
-			const typed = event as { type?: string; message?: { role?: string; content?: unknown } };
-			if (typed.type === "message_end" && typed.message?.role === "assistant") {
-				assistantText = extractAssistantText(typed.message.content);
-			}
-		};
-
-		proc.stdout.on("data", (data) => {
-			buffer += data.toString();
-			const lines = buffer.split("\n");
-			buffer = lines.pop() || "";
-			for (const line of lines) processLine(line);
-		});
-		proc.stderr.on("data", (data) => {
-			stderr += data.toString();
-		});
-		proc.on("error", (error) => {
-			deregisterCleaveProc(proc);
-			clearTimeout(escalationTimer);
-			settleReject(error);
-		});
-		proc.on("close", (code) => {
-			deregisterCleaveProc(proc);
-			clearTimeout(escalationTimer);
-			if (buffer.trim()) processLine(buffer.trim());
-			if ((code ?? 1) !== 0) {
-				settleReject(new Error(stderr.trim() || `Assessment subprocess exited with code ${code ?? 1}.`));
-				return;
-			}
-			const sourceText = assistantText || stdout;
-			const jsonText = extractJsonObject(sourceText);
-			if (!jsonText) {
-				settleReject(new Error(`Assessment subprocess did not return parseable JSON.\n${stderr || stdout}`));
-				return;
-			}
-			try {
-				const parsed = JSON.parse(jsonText) as AssessSpecAgentResult;
-				settleResolve({
-					assessed: normalizeSpecAssessment(parsed, input.expectedScenarioCount),
-				});
-			} catch (error) {
-				const message = error instanceof Error ? error.message : String(error);
-				settleReject(new Error(`Assessment JSON was invalid: ${message}`));
-			}
-		});
-
-		proc.stdin.write(prompt);
-		proc.stdin.end();
-	});
-}
 
 function applyAssessEffects(pi: ExtensionAPI, result: AssessStructuredResult): void {
 	for (const effect of result.effects) {
@@ -1313,14 +1145,18 @@ async function executeAssessSpec(
 		...(diffContent ? ["", "### Recent Changes (for context)", "", "```diff", diffContent, "```"] : []),
 	].join("\n");
 
-	if (isInteractiveAssessContext(ctx)) {
+	// Use the follow-up pattern for any in-session context: return the prepared
+	// assessment prompt and let the current LLM session evaluate scenarios.
+	// The subprocess path below is retained only for programmatic callers that
+	// inject overrides.runSpecAssessment (e.g. tests).
+	if (isInteractiveAssessContext(ctx) || ctx.bridgeInvocation) {
 		const lifecycleRecord = await buildLifecycleRecord(pi, ctx.cwd, {
 			changeName: target.name,
 			assessmentKind: "spec",
 			outcome: "ambiguous",
 			recommendedAction: `Run openspec_manage reconcile_after_assess ${target.name} with outcome pass, reopen, or ambiguous after scenario evaluation completes.`,
 		});
-		return makeAssessResult({
+		const result = makeAssessResult({
 			subcommand: "spec",
 			args,
 			ok: true,
@@ -1343,9 +1179,22 @@ async function executeAssessSpec(
 			lifecycle,
 			lifecycleRecord,
 		});
+		// For bridge invocations, eagerly deliver effects so the follow-up prompt
+		// reaches the LLM even if the caller pipeline doesn't include a handler
+		// that calls applyAssessEffects. Clear effects after to prevent double-
+		// delivery (the agentHandler also calls applyAssessEffects).
+		// Interactive callers leave effects intact for interactiveHandler to apply.
+		if (ctx.bridgeInvocation) {
+			applyAssessEffects(pi, result);
+			result.effects = [];
+		}
+		return result;
 	}
 
-	const runSpecAssessment = overrides?.runSpecAssessment ?? runSpecAssessmentSubprocess;
+	if (!overrides?.runSpecAssessment) {
+		throw new Error("[assess spec] Unexpected code path: neither interactive nor bridge context, and no runSpecAssessment override provided.");
+	}
+	const runSpecAssessment = overrides.runSpecAssessment;
 	const completed = await runSpecAssessment({
 		repoPath,
 		changeName: target.name,
@@ -1734,6 +1583,7 @@ export default function cleaveExtension(pi: ExtensionAPI) {
 		promptSnippet:
 			"Assess task complexity for decomposition — returns pattern match, complexity score, and execute/cleave decision",
 		promptGuidelines: [
+			"Every non-trivial code change must include tests in co-located *.test.ts files. Untested code is incomplete — do not commit without tests for new functions and changed behavior.",
 			"Call cleave_assess before starting any multi-system or cross-cutting task to determine if decomposition is needed",
 			"If decision is 'execute', proceed directly. If 'cleave', use /cleave to decompose. If 'needs_assessment', proceed directly — it means no pattern matched but the task is likely simple enough for in-session execution.",
 			"Complexity formula: (1 + systems) × (1 + 0.5 × modifiers). Threshold default: 2.0.",

package/extensions/cleave/workspace.ts

@@ -238,9 +238,10 @@ ${skillSection}${designSection}${guardrailSection ?? ""}
 ## Contract
 
 1. Only work on files within your scope
-2. Update the Result section below when done
-3. Commit your work with clear messages — do not push
-4. If the task is too complex, set status to NEEDS_DECOMPOSITION
+2. Write tests for new functions and changed behavior — co-locate as *.test.ts
+3. Update the Result section below when done
+4. Commit your work with clear messages — do not push
+5. If the task is too complex, set status to NEEDS_DECOMPOSITION
 
 ## Result
 

package/extensions/dashboard/footer.ts

@@ -546,27 +546,33 @@ export class DashboardFooter implements Component {
     // ── Provider / model / thinking line ──────────────────────
     const m = ctx.model;
     if (m) {
-      const multiProvider = this.footerData.getAvailableProviderCount() > 1;
       const pointer = theme.fg("accent", "▸");
-      const dot = theme.fg("dim", "  ·  ");
+      const dot = theme.fg("dim", " · ");
 
+      // Width-aware: narrow cards drop provider prefix, abbreviate thinking
+      const narrow = width < 40;
+      const multiProvider = !narrow && this.footerData.getAvailableProviderCount() > 1;
+
+      // Shorten model ID for display: "claude-opus-4-6" stays, but drop provider/ prefix if present in ID
+      const modelDisplay = m.id.replace(/^.*\//, "");
       const providerModel = multiProvider
-        ? `${pointer} ${theme.fg("muted", m.provider)} ${theme.fg("dim", "/")} ${theme.fg("muted", m.id)}`
-        : `${pointer} ${theme.fg("muted", m.id)}`;
+        ? `${pointer} ${theme.fg("muted", m.provider)}${theme.fg("dim", "/")}${theme.fg("muted", modelDisplay)}`
+        : `${pointer} ${theme.fg("muted", modelDisplay)}`;
 
       const parts: string[] = [providerModel];
 
-      if (m.reasoning) {
+      if (m.reasoning && this.cachedThinkingLevel) {
         const thinkColor: ThemeColor = this.cachedThinkingLevel === "high"    ? "accent"
           : this.cachedThinkingLevel === "medium"   ? "muted"
           : "dim";
         const thinkIcon = this.cachedThinkingLevel === "off"
           ? theme.fg("dim", "○")
           : theme.fg(thinkColor, "◉");
-        parts.push(`${thinkIcon} ${theme.fg(thinkColor, this.cachedThinkingLevel)}`);
+        // Narrow: icon only, no label
+        parts.push(narrow ? thinkIcon : `${thinkIcon} ${theme.fg(thinkColor, this.cachedThinkingLevel)}`);
       }
 
-      if (this.cachedTokens.cost > 0) {
+      if (this.cachedTokens.cost > 0 && !narrow) {
         parts.push(theme.fg("dim", `$${this.cachedTokens.cost.toFixed(3)}`));
       }
 
@@ -592,7 +598,8 @@ export class DashboardFooter implements Component {
 
     if (!metrics && totalFacts === null) return "";
 
-    const sep = theme.fg("dim", "  ·  ");
+    const sep = theme.fg("dim", " · ");
+    const narrow = width < 35;
     const parts: string[] = [];
 
     if (totalFacts !== null) {
@@ -600,17 +607,24 @@ export class DashboardFooter implements Component {
     }
 
     if (metrics) {
+      // Always show injection count and token estimate
       if (metrics.projectFactCount > 0)
         parts.push(theme.fg("dim", "inj ") + theme.fg("muted", String(metrics.projectFactCount)));
-      if (metrics.workingMemoryFactCount > 0)
+      // Show working memory and episodes only when there's room
+      if (!narrow && metrics.workingMemoryFactCount > 0)
         parts.push(theme.fg("dim", "wm ")  + theme.fg("muted", String(metrics.workingMemoryFactCount)));
-      if (metrics.episodeCount > 0)
+      if (!narrow && metrics.episodeCount > 0)
         parts.push(theme.fg("dim", "ep ")  + theme.fg("muted", String(metrics.episodeCount)));
-      if (metrics.globalFactCount > 0)
+      // Drop global count in narrow — least useful
+      if (!narrow && metrics.globalFactCount > 0)
         parts.push(theme.fg("dim", "gl ")  + theme.fg("muted", String(metrics.globalFactCount)));
-      parts.push(theme.fg("dim", `~${metrics.estimatedTokens}`));
+      // Token estimate — always show, use compact format
+      const tokStr = metrics.estimatedTokens >= 1000
+        ? `~${(metrics.estimatedTokens / 1000).toFixed(1)}k`
+        : `~${metrics.estimatedTokens}`;
+      parts.push(theme.fg("dim", tokStr));
     } else {
-      parts.push(theme.fg("dim", "pending injection"));
+      parts.push(theme.fg("dim", "pending"));
     }
 
     return truncateToWidth(`  ${parts.join(sep)}`, width, "…");
@@ -674,6 +688,41 @@ export class DashboardFooter implements Component {
     return lines;
   }
 
+  /**
+   * Derive a short directive label from the active mind name.
+   * "directive/my-feature" → "my-feature", null/default → null.
+   */
+  private getDirectiveLabel(): string | null {
+    const mind = sharedState.activeMind;
+    if (!mind || mind === "default") return null;
+    // Strip common prefixes: "directive/", "mind/"
+    const label = mind.replace(/^(?:directive|mind)\//, "");
+    return label || null;
+  }
+
+  /**
+   * Build directive indicator lines for the model card area.
+   * Shows "▸ directive: my-feature ✓" (branch match) or "▸ directive: my-feature ⚠ main" (mismatch).
+   * Returns empty array when no directive is active.
+   */
+  private buildDirectiveIndicatorLines(width: number): string[] {
+    const label = this.getDirectiveLabel();
+    if (!label) return [];
+    const theme = this.theme;
+    const directive = sharedState.activeDirective;
+    const currentBranch = this.footerData.getGitBranch?.() ?? "";
+
+    let branchBadge = "";
+    if (directive && currentBranch) {
+      branchBadge = currentBranch === directive.branch
+        ? ` ${theme.fg("success", "✓")}`
+        : ` ${theme.fg("error", "⚠")} ${theme.fg("dim", currentBranch)}`;
+    }
+
+    const line = `${theme.fg("warning", "▸")} ${theme.fg("dim", "directive:")} ${theme.fg("warning", label)}${branchBadge}`;
+    return [truncateToWidth(line, width, "…")];
+  }
+
   private buildModelTopologySummaries(): DashboardModelRoleSummary[] {
     const ctx = this.ctxRef;
     const summaries: DashboardModelRoleSummary[] = [];
@@ -751,8 +800,12 @@ export class DashboardFooter implements Component {
             : theme.fg("dim", summary.state));
     const normalized = normalizeLocalModelLabel(summary.model);
     const alias = forceCompact ? "" : (normalized.alias ? theme.fg("dim", `alias ${normalized.alias}`) : "");
-    const roleLabel = forceCompact ? summary.label.slice(0, 1) : summary.label;
-    const primary = `${theme.fg("accent", roleLabel)} ${theme.fg("muted", normalized.canonical)}`;
+    // In very compact mode, drop the role label to give more room to the model name
+    const veryCompact = width < 30;
+    const roleLabel = veryCompact ? "" : (forceCompact ? summary.label.slice(0, 1) : summary.label);
+    const primary = roleLabel
+      ? `${theme.fg("accent", roleLabel)} ${theme.fg("muted", normalized.canonical)}`
+      : theme.fg("muted", normalized.canonical);
     return truncateToWidth(
       composePrimaryMetaLine(
         width,
@@ -790,7 +843,10 @@ export class DashboardFooter implements Component {
         contextCard: this.buildSummaryCard("context", this.buildHudContextLines(Math.max(1, safeWidth - 2)).map((l) => l.trimStart()), safeWidth),
         modelCard: this.buildSummaryCard(
           "models",
-          this.buildModelTopologySummaries().map((s) => this.formatModelTopologyLine(s, Math.max(1, safeWidth - 2), safeWidth < 44)),
+          [
+            ...this.buildDirectiveIndicatorLines(Math.max(1, safeWidth - 2)),
+            ...this.buildModelTopologySummaries().map((s) => this.formatModelTopologyLine(s, Math.max(1, safeWidth - 2), safeWidth < 44)),
+          ],
           safeWidth,
         ),
         memoryCard: this.buildSummaryCard("memory", (() => {
@@ -852,7 +908,10 @@ export class DashboardFooter implements Component {
       contextCard: this.buildSummaryCardForColumn("context", this.buildHudContextLines(Math.max(1, col1W - 2)).map((l) => l.trimStart()), col1W, col1W),
       modelCard: this.buildSummaryCardForColumn(
         "models",
-        this.buildModelTopologySummaries().map((s) => this.formatModelTopologyLine(s, Math.max(1, col2W - 2), col2W < 44)),
+        [
+          ...this.buildDirectiveIndicatorLines(Math.max(1, col2W - 2)),
+          ...this.buildModelTopologySummaries().map((s) => this.formatModelTopologyLine(s, Math.max(1, col2W - 2), col2W < 44)),
+        ],
         col2W,
         col2W,
       ),
@@ -1074,10 +1133,14 @@ export class DashboardFooter implements Component {
       }
     }
 
-    // If no focused node and no implementing nodes, show all nodes (up to MAX_NODES)
+    // If no focused node and no implementing nodes, show actionable nodes only.
+    // Filter out decided/implemented/resolved — those are done; the footer should
+    // surface work in progress, not a historical catalog.
     if (!dt.focusedNode && (!dt.implementingNodes || dt.implementingNodes.length === 0) && dt.nodes) {
+      const TERMINAL_STATUSES = new Set(["decided", "implemented", "resolved"]);
+      const actionable = dt.nodes.filter(n => !TERMINAL_STATUSES.has(n.status));
       const MAX_NODES = 6;
-      for (const n of dt.nodes.slice(0, MAX_NODES)) {
+      for (const n of actionable.slice(0, MAX_NODES)) {
         const icon = this.nodeStatusIcon(n.status);
         const badge = designSpecBadge(n.designSpec, n.assessmentResult, (c, t) => theme.fg(c as any, t));
         const badgeSep = badge ? " " : "";
@@ -1090,9 +1153,9 @@ export class DashboardFooter implements Component {
           [qSuffix + linkSuffix],
         ));
       }
-      if (dt.nodes.length > MAX_NODES) {
+      if (actionable.length > MAX_NODES) {
         lines.push(
-          theme.fg("dim", `  … ${dt.nodes.length - MAX_NODES} more`) +
+          theme.fg("dim", `  … ${actionable.length - MAX_NODES} more`) +
           theme.fg("dim", " — /dashboard to expand"),
         );
       }

package/extensions/defaults.ts

@@ -77,7 +77,7 @@ function restoreTerminalColors(): void {
 }
 
 /** Ownership marker written by scripts/export-kitty-theme.ts into alpharius.conf */
-const KITTY_OWNERSHIP_MARKER = "# Generated from themes/alpharius.json by scripts/export-kitty-theme.ts";
+const KITTY_OWNERSHIP_MARKER = "# Generated by scripts/export-kitty-theme.ts";
 
 /** Installed location — standard Kitty themes directory */
 const KITTY_CONF_PATH = path.join(