@leing2021/super-pi 0.30.6 → 0.31.0

package/README.md

@@ -98,6 +98,8 @@ Configure in `.pi/settings.json`:
 
 Model and thinking level switch automatically — no manual `/model` needed.
 
+Routing triggers on explicit `/skill:` commands **and** when the agent reads a stage's `SKILL.md` on its own. If no strategy is configured, routing is a no-op — the session model is never touched. Project-level settings take precedence; missing keys fall back to global `~/.pi/agent/settings.json`.
+
 ## Design Philosophy & Acknowledgements
 
 **80% planning and review, 20% execution.**

package/extensions/ce-core/index.ts

@@ -1,7 +1,4 @@
-import { readFile } from "node:fs/promises"
-import path from "node:path"
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent"
-import { CONFIG_DIR_NAME } from "@earendil-works/pi-coding-agent"
 import { Type } from "typebox"
 import { createArtifactHelperTool, type ArtifactType } from "./tools/artifact-helper"
 import { createAskUserQuestionTool, CUSTOM_SENTINEL } from "./tools/ask-user-question"
@@ -19,14 +16,7 @@ import { createContextHandoffTool } from "./tools/context-handoff"
 import { filterBashOutput } from "./tools/bash-output-filter"
 import { filterReadOutput } from "./tools/read-output-filter"
 import { COMPACTION_FOCUS_INSTRUCTIONS } from "./tools/compaction-optimizer"
-
-const PIPELINE_STAGE_KEYS = new Set([
-  "01-brainstorm",
-  "02-plan",
-  "03-work",
-  "04-review",
-  "05-learn",
-])
+import { applyStageStrategies, parseStageSkillName, parseStageSkillPath } from "./utils/stage-routing"
 
 /**
  * Module-level promise chain that serializes interactive `ask_user_question`
@@ -92,91 +82,6 @@ function buildAskUserQuestionUi(ctx: any): import("./tools/ask-user-question").A
   return { input, select }
 }
 
-interface StrategySettings {
-  modelStrategy?: Record<string, string>
-  thinkingStrategy?: Record<string, string>
-}
-
-/**
- * Read settings from two locations (config dir honors pi's `CONFIG_DIR_NAME`,
- * which defaults to `.pi` but is user-configurable since pi 0.79.7):
- * 1. Project-level: {cwd}/{CONFIG_DIR_NAME}/settings.json (highest priority)
- * 2. Global-level: ~/{CONFIG_DIR_NAME}/agent/settings.json (fallback)
- *
- * Project-level takes precedence; global-level is used as fallback.
- */
-async function readSettings(cwd: string): Promise<StrategySettings | null> {
-  const agentHome = process.env.HOME || "~"
-  // Try project-level first
-  const projectPath = path.join(cwd, CONFIG_DIR_NAME, "settings.json")
-  try {
-    const content = await readFile(projectPath, "utf8")
-    const projectSettings = JSON.parse(content) as StrategySettings
-    // If project has modelStrategy or thinkingStrategy, use it
-    if (projectSettings.modelStrategy || projectSettings.thinkingStrategy) {
-      return projectSettings
-    }
-  } catch {
-    // Project settings not found, continue to global
-  }
-
-  // Fallback to global-level
-  const globalPath = path.join(agentHome, CONFIG_DIR_NAME, "agent", "settings.json")
-  try {
-    const content = await readFile(globalPath, "utf8")
-    return JSON.parse(content) as StrategySettings
-  } catch {
-    // Global settings not found either
-  }
-
-  // Try ~/{CONFIG_DIR_NAME}/settings.json as another fallback
-  const altGlobalPath = path.join(agentHome, CONFIG_DIR_NAME, "settings.json")
-  try {
-    const content = await readFile(altGlobalPath, "utf8")
-    return JSON.parse(content) as StrategySettings
-  } catch {
-    return null
-  }
-}
-
-function parseStageSkillName(text: string): string | null {
-  const trimmed = text.trim()
-  const match = trimmed.match(/^\/skill:([^\s]+)/)
-  if (!match) {
-    return null
-  }
-
-  const skillName = match[1]
-  return PIPELINE_STAGE_KEYS.has(skillName) ? skillName : null
-}
-
-function parseModelRef(
-  modelRef: string,
-  currentProvider?: string,
-): { provider: string, id: string } | null {
-  const trimmed = modelRef.trim()
-  if (!trimmed) {
-    return null
-  }
-
-  const slashIndex = trimmed.indexOf("/")
-  if (slashIndex > 0 && slashIndex < trimmed.length - 1) {
-    return {
-      provider: trimmed.slice(0, slashIndex),
-      id: trimmed.slice(slashIndex + 1),
-    }
-  }
-
-  if (!currentProvider) {
-    return null
-  }
-
-  return {
-    provider: currentProvider,
-    id: trimmed,
-  }
-}
-
 const artifactHelperParams = Type.Object({
   repoRoot: Type.String({ description: "Repository root where workflow artifacts should be created" }),
   artifactType: Type.Union([
@@ -360,78 +265,31 @@ export default function ceCoreExtension(pi: ExtensionAPI) {
       return { action: "continue" as const }
     }
 
-    const settings = await readSettings(ctx.cwd)
-    const modelStrategy = settings?.modelStrategy
-    const thinkingStrategy = settings?.thinkingStrategy
-    // Notification guard: only notify in interactive (TUI) or RPC modes.
-    // For interactive input capability checks (askUserQuestion), use ctx.hasUI directly.
-    const shouldNotify = ctx.mode === "tui" || ctx.mode === "rpc"
-
-    // Model switching
-    if (modelStrategy) {
-      const targetModelRef = modelStrategy[stageKey] ?? modelStrategy.default
-      if (targetModelRef) {
-        const parsed = parseModelRef(targetModelRef, ctx.model?.provider)
-        if (parsed) {
-          // Skip if already using the same model
-          if (ctx.model?.provider !== parsed.provider || ctx.model?.id !== parsed.id) {
-            const model = ctx.modelRegistry.find(parsed.provider, parsed.id)
-            if (model) {
-              const switched = await pi.setModel(model)
-              if (switched) {
-                if (shouldNotify) {
-                  ctx.ui.notify(`Switched model for ${stageKey}: ${model.provider}/${model.id}`, "info")
-                }
-              } else {
-                if (shouldNotify) {
-                  ctx.ui.notify(`No API key for ${stageKey}: ${model.provider}/${model.id}`, "warning")
-                }
-              }
-            } else if (shouldNotify) {
-              ctx.ui.notify(`Model not found for ${stageKey}: ${targetModelRef}`, "warning")
-            }
-          }
-        } else if (shouldNotify) {
-          ctx.ui.notify(`Invalid modelStrategy for ${stageKey}: ${targetModelRef}`, "warning")
-        }
-      }
-    }
-
-    // Thinking level switching
-    if (thinkingStrategy) {
-      const targetThinking = thinkingStrategy[stageKey] ?? thinkingStrategy.default
-      if (targetThinking) {
-        const levelMap: Record<string, ReturnType<ExtensionAPI["getThinkingLevel"]>> = {
-          off: "off",
-          minimal: "minimal",
-          low: "low",
-          medium: "medium",
-          high: "high",
-          xhigh: "xhigh",
-          max: "max",
-          "0": "low",
-          "1": "medium",
-          "2": "high",
-        }
-        const rawThinking = targetThinking.toLowerCase()
-        const knownLevel = levelMap[rawThinking]
-        const normalized = knownLevel ?? "medium"
-        if (!knownLevel && shouldNotify) {
-          ctx.ui.notify(`Unknown thinking level for ${stageKey}: ${targetThinking}, falling back to medium`, "warning")
-        }
-        const currentLevel = pi.getThinkingLevel()
-        if (currentLevel !== normalized) {
-          pi.setThinkingLevel(normalized)
-          if (shouldNotify) {
-            ctx.ui.notify(`Switched thinking level for ${stageKey}: ${normalized}`, "info")
-          }
-        }
-      }
-    }
+    await applyStageStrategies(pi, ctx, stageKey)
 
     return { action: "continue" as const }
   })
 
+  // Model-initiated skill invocation: when the agent reads a pipeline
+  // stage's SKILL.md (instead of the user typing /skill:), route the
+  // stage's model/thinking strategies the same way. Reads of other paths
+  // are untouched.
+  pi.on("tool_call", async (event, ctx) => {
+    if (event.toolName !== "read") {
+      return undefined
+    }
+    const filePath = (event.input as { path?: unknown } | undefined)?.path
+    if (typeof filePath !== "string") {
+      return undefined
+    }
+    const stageKey = parseStageSkillPath(filePath)
+    if (!stageKey) {
+      return undefined
+    }
+    await applyStageStrategies(pi, ctx, stageKey)
+    return undefined
+  })
+
   const artifactHelper = createArtifactHelperTool()
   const askUserQuestion = createAskUserQuestionTool()
   const workflowState = createWorkflowStateTool()

package/extensions/ce-core/utils/stage-routing.ts

@@ -0,0 +1,230 @@
+import { readFile } from "node:fs/promises"
+import path from "node:path"
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent"
+import { CONFIG_DIR_NAME } from "@earendil-works/pi-coding-agent"
+
+export const PIPELINE_STAGE_KEYS = new Set([
+  "01-brainstorm",
+  "02-plan",
+  "03-work",
+  "04-review",
+  "05-learn",
+  "06-next",
+  "07-worktree",
+])
+
+interface StrategySettings {
+  modelStrategy?: Record<string, string>
+  thinkingStrategy?: Record<string, string>
+}
+
+/**
+ * Structural subset of the extension context used by stage routing.
+ * Keeps the routing helpers testable without full ExtensionContext mocks.
+ */
+interface StageRoutingContext {
+  cwd: string
+  mode?: string
+  hasUI?: boolean
+  model?: { provider?: string, id?: string }
+  modelRegistry?: { find(provider: string, id: string): unknown }
+  ui?: { notify(message: string, level?: string): void }
+}
+
+/**
+ * Model/thinking strategies only matter where the user can see the switch
+ * notification; silent hosts would swallow failures.
+ */
+function shouldNotifyRouting(ctx: StageRoutingContext): boolean {
+  return ctx.mode === "tui" || ctx.mode === "rpc"
+}
+
+async function applyModelStrategy(
+  pi: ExtensionAPI,
+  ctx: StageRoutingContext,
+  stageKey: string,
+  strategy: Record<string, string> | undefined,
+): Promise<void> {
+  if (!strategy) {
+    return
+  }
+  const notify = (message: string, level: "info" | "warning") => {
+    if (shouldNotifyRouting(ctx)) {
+      ctx.ui?.notify(message, level)
+    }
+  }
+
+  const targetModelRef = strategy[stageKey] ?? strategy.default
+  if (!targetModelRef) {
+    return
+  }
+  const parsed = parseModelRef(targetModelRef, ctx.model?.provider)
+  if (!parsed) {
+    notify(`Invalid modelStrategy for ${stageKey}: ${targetModelRef}`, "warning")
+    return
+  }
+  // Skip if already using the same model (idempotent re-reads).
+  if (ctx.model?.provider === parsed.provider && ctx.model?.id === parsed.id) {
+    return
+  }
+  const model = ctx.modelRegistry?.find(parsed.provider, parsed.id)
+  if (!model) {
+    notify(`Model not found for ${stageKey}: ${targetModelRef}`, "warning")
+    return
+  }
+  const switched = await pi.setModel(model as Parameters<ExtensionAPI["setModel"]>[0])
+  if (switched) {
+    notify(`Switched model for ${stageKey}: ${parsed.provider}/${parsed.id}`, "info")
+  } else {
+    notify(`No API key for ${stageKey}: ${parsed.provider}/${parsed.id}`, "warning")
+  }
+}
+
+function applyThinkingStrategy(
+  pi: ExtensionAPI,
+  ctx: StageRoutingContext,
+  stageKey: string,
+  strategy: Record<string, string> | undefined,
+): void {
+  if (!strategy) {
+    return
+  }
+  const targetThinking = strategy[stageKey] ?? strategy.default
+  if (!targetThinking) {
+    return
+  }
+  const levelMap: Record<string, ReturnType<ExtensionAPI["getThinkingLevel"]>> = {
+    off: "off",
+    minimal: "minimal",
+    low: "low",
+    medium: "medium",
+    high: "high",
+    xhigh: "xhigh",
+    max: "max",
+    "0": "low",
+    "1": "medium",
+    "2": "high",
+  }
+  const rawThinking = targetThinking.toLowerCase()
+  const knownLevel = levelMap[rawThinking]
+  const normalized = knownLevel ?? "medium"
+  if (!knownLevel && shouldNotifyRouting(ctx)) {
+    ctx.ui?.notify(`Unknown thinking level for ${stageKey}: ${targetThinking}, falling back to medium`, "warning")
+  }
+  if (pi.getThinkingLevel() !== normalized) {
+    pi.setThinkingLevel(normalized)
+    if (shouldNotifyRouting(ctx)) {
+      ctx.ui?.notify(`Switched thinking level for ${stageKey}: ${normalized}`, "info")
+    }
+  }
+}
+
+/**
+ * Apply model + thinking strategies for a pipeline stage. Shared by the
+ * `input` hook (explicit `/skill:` commands) and the `tool_call` hook
+ * (model-initiated SKILL.md reads).
+ */
+export async function applyStageStrategies(
+  pi: ExtensionAPI,
+  ctx: StageRoutingContext,
+  stageKey: string,
+): Promise<void> {
+  const settings = await readSettings(ctx.cwd)
+  await applyModelStrategy(pi, ctx, stageKey, settings?.modelStrategy)
+  applyThinkingStrategy(pi, ctx, stageKey, settings?.thinkingStrategy)
+}
+
+/**
+ * Read settings from two locations (config dir honors pi's `CONFIG_DIR_NAME`,
+ * which defaults to `.pi` but is user-configurable since pi 0.79.7):
+ * 1. Project-level: {cwd}/{CONFIG_DIR_NAME}/settings.json (highest priority)
+ * 2. Global-level: ~/{CONFIG_DIR_NAME}/agent/settings.json (fallback)
+ *
+ * Project-level takes precedence; global-level is used as fallback.
+ */
+async function readSettings(cwd: string): Promise<StrategySettings | null> {
+  const agentHome = process.env.HOME || "~"
+  // Try project-level first
+  const projectPath = path.join(cwd, CONFIG_DIR_NAME, "settings.json")
+  try {
+    const content = await readFile(projectPath, "utf8")
+    const projectSettings = JSON.parse(content) as StrategySettings
+    // If project has modelStrategy or thinkingStrategy, use it
+    if (projectSettings.modelStrategy || projectSettings.thinkingStrategy) {
+      return projectSettings
+    }
+  } catch {
+    // Project settings not found, continue to global
+  }
+
+  // Fallback to global-level
+  const globalPath = path.join(agentHome, CONFIG_DIR_NAME, "agent", "settings.json")
+  try {
+    const content = await readFile(globalPath, "utf8")
+    return JSON.parse(content) as StrategySettings
+  } catch {
+    // Global settings not found either
+  }
+
+  // Try ~/{CONFIG_DIR_NAME}/settings.json as another fallback
+  const altGlobalPath = path.join(agentHome, CONFIG_DIR_NAME, "settings.json")
+  try {
+    const content = await readFile(altGlobalPath, "utf8")
+    return JSON.parse(content) as StrategySettings
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Detect a pipeline stage SKILL.md path, e.g.
+ * `.../skills/03-work/SKILL.md`. Returns the stage key or null.
+ */
+export function parseStageSkillPath(filePath: string): string | null {
+  // Accept absolute paths, `./`-prefixed, and bare relative paths like
+  // `skills/03-work/SKILL.md` (the read tool allows relative paths).
+  const match = filePath.match(/(?:^|[\\/])skills[\\/]([^\\/]+)[\\/]SKILL\.md$/)
+  if (!match) {
+    return null
+  }
+  const stageKey = match[1]
+  return PIPELINE_STAGE_KEYS.has(stageKey) ? stageKey : null
+}
+
+export function parseStageSkillName(text: string): string | null {
+  const trimmed = text.trim()
+  const match = trimmed.match(/^\/skill:([^\s]+)/)
+  if (!match) {
+    return null
+  }
+
+  const skillName = match[1]
+  return PIPELINE_STAGE_KEYS.has(skillName) ? skillName : null
+}
+
+function parseModelRef(
+  modelRef: string,
+  currentProvider?: string,
+): { provider: string, id: string } | null {
+  const trimmed = modelRef.trim()
+  if (!trimmed) {
+    return null
+  }
+
+  const slashIndex = trimmed.indexOf("/")
+  if (slashIndex > 0 && slashIndex < trimmed.length - 1) {
+    return {
+      provider: trimmed.slice(0, slashIndex),
+      id: trimmed.slice(slashIndex + 1),
+    }
+  }
+
+  if (!currentProvider) {
+    return null
+  }
+
+  return {
+    provider: currentProvider,
+    id: trimmed,
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leing2021/super-pi",
-  "version": "0.30.6",
+  "version": "0.31.0",
   "private": false,
   "type": "module",
   "description": "Pi-native Compound Engineering package for iterative development workflows",

package/skills/references/pipeline-config.md

@@ -4,8 +4,12 @@ Use these rules in all Phase 1 skills: `01-brainstorm` → `02-plan` → `03-wor
 
 ## Start of skill: model routing
 
-Model routing is handled automatically by the ce-core extension's `input` hook.
-When a user types `/skill:01-brainstorm` through `/skill:05-learn`, the extension:
+Model routing is handled automatically by the ce-core extension, with two triggers:
+
+1. **Explicit command**: the user types `/skill:01-brainstorm` through `/skill:07-worktree` (the `input` hook).
+2. **Model-initiated skill load**: the agent reads a stage's `SKILL.md` (e.g. `.../skills/03-work/SKILL.md`) without an explicit command (the `tool_call` hook).
+
+On either trigger the extension:
 
 1. Reads `.pi/settings.json` from the project root.
 2. Parses `modelStrategy[stageKey]` or falls back to `modelStrategy.default`.