supipowers 1.2.6 → 1.5.0

package/src/commands/plan.ts

@@ -5,16 +5,19 @@ import {
   generateVisualSessionId,
   createSessionDir,
   getScriptsDir,
-  parseServerInfo,
 } from "../visual/companion.js";
+import { startVisualServer } from "../visual/start-server.js";
 import { buildVisualInstructions } from "../visual/prompt-instructions.js";
 import { buildPlanningPrompt, buildQuickPlanPrompt } from "../planning/prompt-builder.js";
+import type { PlanningSystemPromptOptions } from "../planning/system-prompt.js";
+import { createDebugLogger } from "../debug/logger.js";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { modelRegistry } from "../config/model-registry-instance.js";
 import { resolveModelForAction, createModelBridge, applyModelOverride } from "../config/model-resolver.js";
 import { loadModelConfig } from "../config/model-config.js";
-import { startPlanTracking } from "../planning/approval-flow.js";
+import { cancelPlanTracking, startPlanTracking } from "../planning/approval-flow.js";
+import { stopVisualServer } from "../visual/stop-server.js";
 
 modelRegistry.register({
   id: "plan",
@@ -38,121 +41,174 @@ export function registerPlanCommand(platform: Platform): void {
   platform.registerCommand("supi:plan", {
     description: "Start collaborative planning for a feature or task",
     async handler(args: string | undefined, ctx: any) {
-      // Resolve and apply model override early — before any logic that might fail
-      const modelCfg = loadModelConfig(platform.paths, ctx.cwd);
-      const bridge = createModelBridge(platform);
-      const resolved = resolveModelForAction("plan", modelRegistry, modelCfg, bridge);
-      await applyModelOverride(platform, ctx, "plan", resolved);
-
-      const skillPath = findSkillPath("planning");
-      let skillContent = "";
-      if (skillPath) {
-        try {
-          skillContent = fs.readFileSync(skillPath, "utf-8");
-        } catch {
-          // Skill file not found — proceed without it
+      const debugLogger = createDebugLogger(platform.paths, ctx, "plan");
+      let trackingStarted = false;
+      debugLogger.log("plan_command_invoked", {
+        args: args ?? null,
+        cwd: ctx.cwd ?? null,
+        hasUI: ctx.hasUI ?? false,
+      });
+
+      try {
+        // Resolve and apply model override early — before any logic that might fail
+        const modelCfg = loadModelConfig(platform.paths, ctx.cwd);
+        const bridge = createModelBridge(platform);
+        const resolved = resolveModelForAction("plan", modelRegistry, modelCfg, bridge);
+        await applyModelOverride(platform, ctx, "plan", resolved);
+        debugLogger.log("plan_model_override_applied", {
+          configuredAction: "plan",
+        });
+
+        const skillPath = findSkillPath("planning");
+        let skillContent = "";
+        if (skillPath) {
+          try {
+            skillContent = fs.readFileSync(skillPath, "utf-8");
+          } catch {
+            // Skill file not found — proceed without it
+          }
         }
-      }
+        debugLogger.log("planning_skill_loaded", {
+          found: Boolean(skillPath),
+          skillPath: skillPath ?? null,
+          skillBytes: skillContent.length,
+        });
 
-      const isQuick = args?.startsWith("--quick") ?? false;
-      const quickDesc = isQuick ? args!.replace("--quick", "").trim() : "";
-
-      // ── Visual companion consent ──────────────────────────────────
-      let visualUrl: string | null = null;
-      let visualSessionDir: string | null = null;
-
-      if (ctx.hasUI && !isQuick) {
-        const modeChoice = await ctx.ui.select(
-          "Planning mode",
-          [
-            "Terminal only",
-            "Terminal + Visual companion (opens browser)",
-          ],
-          { helpText: "Visual companion shows mockups and diagrams in a browser · Esc to cancel" },
-        );
-        if (!modeChoice) return;
-
-        if (modeChoice.startsWith("Terminal + Visual")) {
-          const sessionId = generateVisualSessionId();
-          visualSessionDir = createSessionDir(platform.paths, ctx.cwd, sessionId);
-          const scriptsDir = getScriptsDir();
-
-          // Install server dependencies if needed
-          const nodeModules = path.join(scriptsDir, "node_modules");
-          if (!fs.existsSync(nodeModules)) {
-            notifyInfo(ctx, "Installing visual companion dependencies...");
-            const installResult = await platform.exec("npm", ["install", "--production"], { cwd: scriptsDir });
-            if (installResult.code !== 0) {
-              notifyError(ctx, "Failed to install visual companion dependencies", installResult.stderr);
-              visualSessionDir = null;
-            }
+        const isQuick = args?.startsWith("--quick") ?? false;
+        const quickDesc = isQuick ? args!.replace("--quick", "").trim() : "";
+        const quickMode = isQuick && quickDesc.length > 0;
+        const planningTopic = quickMode ? quickDesc : args || undefined;
+
+        // ── Visual companion consent ──────────────────────────────────
+        let visualUrl: string | null = null;
+        let visualSessionDir: string | null = null;
+
+        if (ctx.hasUI && !quickMode) {
+          const modeChoice = await ctx.ui.select(
+            "Planning mode",
+            [
+              "Terminal only",
+              "Terminal + Visual companion (opens browser)",
+            ],
+            { helpText: "Visual companion shows mockups and diagrams in a browser · Esc to cancel" },
+          );
+          if (!modeChoice) {
+            debugLogger.log("visual_companion_selection_cancelled");
+            return;
           }
 
-          if (visualSessionDir) {
-            // Stop any previous visual companion
-            if (activeSessionDir) {
-              const stopScript = path.join(scriptsDir, "stop-server.sh");
-              await platform.exec("bash", [stopScript, activeSessionDir], { cwd: scriptsDir });
+          debugLogger.log("visual_companion_mode_selected", {
+            choice: modeChoice,
+          });
+
+          if (modeChoice.startsWith("Terminal + Visual")) {
+            const sessionId = generateVisualSessionId();
+            visualSessionDir = createSessionDir(platform.paths, ctx.cwd, sessionId);
+            const scriptsDir = getScriptsDir();
+
+            // Install server dependencies if needed
+            const nodeModules = path.join(scriptsDir, "node_modules");
+            if (!fs.existsSync(nodeModules)) {
+              notifyInfo(ctx, "Installing visual companion dependencies...");
+              const installResult = await platform.exec("npm", ["install", "--production"], { cwd: scriptsDir });
+              if (installResult.code !== 0) {
+                notifyError(ctx, "Failed to install visual companion dependencies", installResult.stderr);
+                debugLogger.log("visual_companion_dependency_install_failed", {
+                  code: installResult.code,
+                  stderr: installResult.stderr,
+                });
+                visualSessionDir = null;
+              }
             }
 
-            // Start the server (pass session dir via env command since ExecOptions has no env)
-            const startScript = path.join(scriptsDir, "start-server.sh");
-            const startResult = await platform.exec("env", [
-              `SUPI_VISUAL_DIR=${visualSessionDir}`,
-              "bash",
-              startScript,
-            ], { cwd: scriptsDir });
+            if (visualSessionDir) {
+              // Stop any previous visual companion
+              if (activeSessionDir) {
+                stopVisualServer(activeSessionDir);
+              }
+
+              // Start the server in a detached cross-platform process
+              const serverInfo = await startVisualServer({ sessionDir: visualSessionDir });
 
-            if (startResult.code === 0) {
-              const serverInfo = parseServerInfo(startResult.stdout);
               if (serverInfo) {
                 visualUrl = serverInfo.url;
                 activeSessionDir = visualSessionDir;
                 notifyInfo(ctx, "Visual companion ready", visualUrl);
+                debugLogger.log("visual_companion_ready", {
+                  url: visualUrl,
+                  sessionDir: visualSessionDir,
+                });
               } else {
-                notifyError(ctx, "Visual companion started but no connection info received");
+                notifyError(ctx, "Visual companion failed to start");
+                debugLogger.log("visual_companion_start_failed", {
+                  sessionDir: visualSessionDir,
+                });
                 visualSessionDir = null;
               }
-            } else {
-              const errorMsg = startResult.stderr || startResult.stdout;
-              notifyError(ctx, "Failed to start visual companion", errorMsg);
-              visualSessionDir = null;
             }
           }
+        } else {
+          debugLogger.log("visual_companion_skipped", {
+            reason: !ctx.hasUI ? "no_ui" : "quick_mode",
+          });
         }
-      }
 
-      // ── Build prompt ──────────────────────────────────────────────
-      let prompt: string;
-      if (isQuick && quickDesc) {
-        prompt = buildQuickPlanPrompt(quickDesc, skillContent || undefined);
-      } else {
-        prompt = buildPlanningPrompt({
-          topic: args || undefined,
+        // ── Build prompt ──────────────────────────────────────────────
+        const planningPromptOptions: PlanningSystemPromptOptions = {
+          topic: planningTopic,
           skillContent: skillContent || undefined,
           dotDirDisplay: platform.paths.dotDirDisplay,
-        });
-      }
+          isQuick: quickMode,
+        };
 
-      // Append visual companion instructions if active
-      if (visualUrl && visualSessionDir) {
-        prompt += "\n\n" + buildVisualInstructions(visualUrl, visualSessionDir);
-      }
+        let prompt = quickMode
+          ? buildQuickPlanPrompt(quickDesc)
+          : buildPlanningPrompt({ topic: planningTopic });
 
+        // Append visual companion instructions if active
+        if (visualUrl && visualSessionDir) {
+          prompt += "\n\n" + buildVisualInstructions(visualUrl, visualSessionDir);
+        }
 
-      platform.sendMessage(
-        {
-          customType: "supi-plan-start",
-          content: [{ type: "text", text: prompt }],
-          display: "none",
-        },
-        { deliverAs: "steer", triggerTurn: true }
-      );
+        debugLogger.log("planning_kickoff_prompt_built", {
+          quickMode,
+          topic: planningTopic ?? null,
+          promptLength: prompt.length,
+          prompt,
+        });
 
-      // Track planning state for the approval flow (agent_end hook)
-      startPlanTracking(ctx.cwd, platform.paths, ctx.newSession?.bind(ctx), resolved);
+        // Track planning state before sending the steer message so the triggered
+        // planning turn sees planning mode as active during before_agent_start.
+        startPlanTracking(
+          ctx.cwd,
+          platform.paths,
+          ctx.newSession?.bind(ctx),
+          resolved,
+          planningPromptOptions,
+          debugLogger,
+        );
+        trackingStarted = true;
 
-      notifyInfo(ctx, "Planning started", args ? `Topic: ${args}` : "Describe what you want to build");
+        platform.sendUserMessage(prompt);
+        debugLogger.log("planning_kickoff_steer_sent", {
+          deliverAs: "sendUserMessage",
+          triggerTurn: true,
+        });
+
+        notifyInfo(ctx, "Planning started", planningTopic ? `Topic: ${planningTopic}` : "Describe what you want to build");
+      } catch (error) {
+        debugLogger.log("plan_command_failed", {
+          message: error instanceof Error ? error.message : String(error),
+          stack: error instanceof Error ? error.stack ?? null : null,
+        });
+        if (trackingStarted) {
+          debugLogger.log("planning_tracking_cancelled", {
+            reason: "plan_command_failed_before_turn",
+          });
+          cancelPlanTracking();
+        }
+        throw error;
+      }
     },
   });
 }

package/src/commands/qa.ts

@@ -1,6 +1,7 @@
 import type { Platform } from "../platform/types.js";
 import * as fs from "node:fs";
 import * as path from "node:path";
+import { moduleDir, toBashPath } from "../utils/paths.js";
 import { notifyInfo } from "../notifications/renderer.js";
 import { loadE2eQaConfig, saveE2eQaConfig, DEFAULT_E2E_QA_CONFIG } from "../qa/config.js";
 import { loadE2eMatrix } from "../qa/matrix.js";
@@ -11,6 +12,8 @@ import type { E2eQaConfig, AppType, E2eRegression } from "../qa/types.js";
 import { modelRegistry } from "../config/model-registry-instance.js";
 import { resolveModelForAction, createModelBridge, applyModelOverride } from "../config/model-resolver.js";
 import { loadModelConfig } from "../config/model-config.js";
+import { detectAppType } from "../qa/detect-app-type.js";
+import { discoverRoutes } from "../qa/discover-routes.js";
 
 modelRegistry.register({
   id: "qa",
@@ -20,13 +23,13 @@ modelRegistry.register({
 });
 
 function getScriptsDir(): string {
-  return path.join(path.dirname(new URL(import.meta.url).pathname), "..", "qa", "scripts");
+  return toBashPath(path.join(moduleDir(import.meta.url), "..", "qa", "scripts"));
 }
 
 function findSkillPath(skillName: string): string | null {
   const candidates = [
     path.join(process.cwd(), "skills", skillName, "SKILL.md"),
-    path.join(path.dirname(new URL(import.meta.url).pathname), "..", "..", "skills", skillName, "SKILL.md"),
+    path.join(moduleDir(import.meta.url), "..", "..", "skills", skillName, "SKILL.md"),
   ];
   for (const p of candidates) {
     if (fs.existsSync(p)) return p;
@@ -127,17 +130,10 @@ export function registerQaCommand(platform: Platform): void {
       let detectedPort: number | null = null;
 
       try {
-        const detectResult = await platform.exec("bash", [
-          path.join(scriptsDir, "detect-app-type.sh"),
-          ctx.cwd,
-        ], { cwd: ctx.cwd });
-
-        if (detectResult.code === 0) {
-          const detected = JSON.parse(detectResult.stdout.trim());
-          detectedType = detected.type;
-          detectedDevCommand = detected.devCommand;
-          detectedPort = detected.port;
-        }
+        const detected = detectAppType(ctx.cwd);
+        detectedType = detected.type;
+        detectedDevCommand = detected.devCommand;
+        detectedPort = detected.port;
       } catch { /* proceed without detection */ }
 
       // ── Step 2: Load or create config ────────────────────────────────
@@ -189,14 +185,9 @@ export function registerQaCommand(platform: Platform): void {
       // ── Step 4: Route discovery ──────────────────────────────────────
       let discoveredRoutes = "";
       try {
-        const routeResult = await platform.exec("bash", [
-          path.join(scriptsDir, "discover-routes.sh"),
-          ctx.cwd,
-          config.app.type,
-        ], { cwd: ctx.cwd });
-
-        if (routeResult.code === 0 && routeResult.stdout.trim()) {
-          discoveredRoutes = routeResult.stdout.trim();
+        const routes = discoverRoutes(ctx.cwd, config.app.type);
+        if (routes.length > 0) {
+          discoveredRoutes = routes.map((r) => JSON.stringify(r)).join("\n");
         }
       } catch { /* agent will discover routes manually */ }
 
@@ -210,7 +201,7 @@ export function registerQaCommand(platform: Platform): void {
 
       // ── Step 6: Create session ───────────────────────────────────────
       const ledger = createNewE2eSession(platform.paths, ctx.cwd, config);
-      const sessionDir = getSessionDir(platform.paths, ctx.cwd, ledger.id);
+      const sessionDir = toBashPath(getSessionDir(platform.paths, ctx.cwd, ledger.id));
 
       // ── Step 7: Load skill ───────────────────────────────────────────
       let skillContent = "";
@@ -225,7 +216,7 @@ export function registerQaCommand(platform: Platform): void {
       const routeCount = discoveredRoutes.split("\n").filter(Boolean).length;
 
       const prompt = buildE2eOrchestratorPrompt({
-        cwd: ctx.cwd,
+        cwd: toBashPath(ctx.cwd),
         appType: config.app,
         sessionDir,
         scriptsDir,