takomi 2.1.30 → 2.1.32

package/.pi/extensions/takomi-runtime/index.ts

@@ -1,8 +1,8 @@
 import { mkdir, readdir, readFile, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
-import { StringEnum } from "@mariozechner/pi-ai";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { StringEnum } from "@earendil-works/pi-ai";
 import { Type } from "typebox";
 import {
   buildSessionState,

package/.pi/extensions/takomi-runtime/shared.ts

@@ -10,7 +10,7 @@ import { mkdir, writeFile } from "node:fs/promises";
 import { spawn } from "node:child_process";
 import os from "node:os";
 import path from "node:path";
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
 // ─── ANSI / String Utilities ────────────────────────────────────────
 

package/.pi/extensions/takomi-runtime/subagent-controller.ts

@@ -1,4 +1,4 @@
-import type { ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import {
   FullscreenSubagentComponent,
   renderSubagentStatus,

package/.pi/extensions/takomi-runtime/subagent-render.ts

@@ -1,4 +1,4 @@
-import type { Theme } from "@mariozechner/pi-coding-agent";
+import type { Theme } from "@earendil-works/pi-coding-agent";
 import {
   ellipsizeMiddle,
   firstMeaningfulLine,

package/.pi/extensions/takomi-runtime/subagent-types.ts

@@ -67,18 +67,18 @@ export interface TakomiSubagentController {
   hasRuns(): boolean;
   getStatusSummary(): string;
   getViewMode(): SubagentViewMode;
-  start(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, state: TakomiSubagentRunInit, runKey?: string): Promise<void>;
-  update(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, patch: TakomiSubagentRunPatch, runKey?: string): Promise<void>;
-  appendLog(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, chunk: string, runKey?: string): Promise<void>;
-  complete(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, patch?: TakomiSubagentRunPatch, runKey?: string): Promise<void>;
-  block(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext, patch?: TakomiSubagentRunPatch, runKey?: string): Promise<void>;
-  reset(ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): void;
+  start(ctx: import("@earendil-works/pi-coding-agent").ExtensionContext, state: TakomiSubagentRunInit, runKey?: string): Promise<void>;
+  update(ctx: import("@earendil-works/pi-coding-agent").ExtensionContext, patch: TakomiSubagentRunPatch, runKey?: string): Promise<void>;
+  appendLog(ctx: import("@earendil-works/pi-coding-agent").ExtensionContext, chunk: string, runKey?: string): Promise<void>;
+  complete(ctx: import("@earendil-works/pi-coding-agent").ExtensionContext, patch?: TakomiSubagentRunPatch, runKey?: string): Promise<void>;
+  block(ctx: import("@earendil-works/pi-coding-agent").ExtensionContext, patch?: TakomiSubagentRunPatch, runKey?: string): Promise<void>;
+  reset(ctx?: import("@earendil-works/pi-coding-agent").ExtensionContext): void;
   refresh(): void;
-  refreshWithContext(ctx: import("@mariozechner/pi-coding-agent").ExtensionContext): void;
-  cycleFocus(direction: SubagentFocusDirection, ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): boolean;
-  setViewMode(mode: SubagentViewMode, ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): SubagentViewMode | undefined;
-  cycleViewMode(ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): SubagentViewMode | undefined;
-  closeFullscreen(ctx?: import("@mariozechner/pi-coding-agent").ExtensionContext): SubagentViewMode;
+  refreshWithContext(ctx: import("@earendil-works/pi-coding-agent").ExtensionContext): void;
+  cycleFocus(direction: SubagentFocusDirection, ctx?: import("@earendil-works/pi-coding-agent").ExtensionContext): boolean;
+  setViewMode(mode: SubagentViewMode, ctx?: import("@earendil-works/pi-coding-agent").ExtensionContext): SubagentViewMode | undefined;
+  cycleViewMode(ctx?: import("@earendil-works/pi-coding-agent").ExtensionContext): SubagentViewMode | undefined;
+  closeFullscreen(ctx?: import("@earendil-works/pi-coding-agent").ExtensionContext): SubagentViewMode;
   getKnownParentRunKey(parentTaskId: string): string | undefined;
 }
 

package/.pi/extensions/takomi-runtime/ui.ts

@@ -1,5 +1,5 @@
-import type { AssistantMessage } from "@mariozechner/pi-ai";
-import type { ExtensionContext, ReadonlyFooterDataProvider, Theme } from "@mariozechner/pi-coding-agent";
+import type { AssistantMessage } from "@earendil-works/pi-ai";
+import type { ExtensionContext, ReadonlyFooterDataProvider, Theme } from "@earendil-works/pi-coding-agent";
 import {
   ellipsizeMiddle,
   formatFooterNumber,

package/.pi/extensions/takomi-subagents/agents.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { getAgentDir, parseFrontmatter } from "@mariozechner/pi-coding-agent";
+import { getAgentDir, parseFrontmatter } from "@earendil-works/pi-coding-agent";
 import type { TakomiThinkingLevel } from "../../../src/pi-takomi-core";
 
 export type TakomiAgentScope = "user" | "project" | "both";

package/.pi/extensions/takomi-subagents/index.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { renderTakomiSubagentCall, renderTakomiSubagentResult } from "./native-render";
 import { executeTakomiSubagentTool } from "./tool-runner";

package/.pi/extensions/takomi-subagents/native-render.ts

@@ -1,6 +1,6 @@
-import type { AgentToolResult } from "@mariozechner/pi-agent-core";
-import type { Theme } from "@mariozechner/pi-coding-agent";
-import { Text } from "@mariozechner/pi-tui";
+import type { AgentToolResult } from "@earendil-works/pi-agent-core";
+import type { Theme } from "@earendil-works/pi-coding-agent";
+import { Text } from "@earendil-works/pi-tui";
 import type { TakomiSubagentToolParams } from "./tool-runner";
 import { renderNativeSubagentResult, type Details } from "./pi-subagents-internal";
 

package/.pi/extensions/takomi-subagents/pi-subagents-engine.ts

@@ -1,8 +1,8 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import type { AgentToolResult } from "@mariozechner/pi-agent-core";
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { AgentToolResult } from "@earendil-works/pi-agent-core";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import {
   loadPiSubagentsInternals,
   type AgentConfig,

package/.pi/extensions/takomi-subagents/tool-runner.ts

@@ -1,5 +1,5 @@
 import path from "node:path";
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { TakomiThinkingLevel } from "../../../src/pi-takomi-core";
 import { loadTakomiProfile } from "../takomi-runtime/profile";
 import { applyTakomiRoutingDefaults, loadTakomiModelRoutingSnapshot } from "../takomi-runtime/model-routing-defaults";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "takomi",
-  "version": "2.1.30",
+  "version": "2.1.32",
   "description": "🎯 Stop wrestling with AI. Start building with purpose. The artisan's toolkit for agent workflows, Codex skills, and original Takomi capabilities like 21st.dev integration.",
   "type": "module",
   "bin": {
@@ -45,11 +45,6 @@
   "author": "J StaR Films Studios",
   "license": "ISC",
   "dependencies": {
-    "@earendil-works/pi-ai": "^0.78.1",
-    "@mariozechner/pi-agent-core": "^0.70.6",
-    "@mariozechner/pi-ai": "^0.70.2",
-    "@mariozechner/pi-coding-agent": "^0.70.2",
-    "@mariozechner/pi-tui": "^0.70.6",
     "commander": "^13.1.0",
     "figlet": "^1.8.0",
     "fs-extra": "^11.3.0",
@@ -62,9 +57,10 @@
   },
   "homepage": "https://github.com/JStaRFilms/VibeCode-Protocol-Suite#readme",
   "devDependencies": {
-    "@earendil-works/pi-agent-core": "^0.78.1",
-    "@earendil-works/pi-coding-agent": "^0.78.1",
-    "@earendil-works/pi-tui": "^0.78.1",
+    "@earendil-works/pi-agent-core": "^0.79.1",
+    "@earendil-works/pi-ai": "^0.79.1",
+    "@earendil-works/pi-coding-agent": "^0.79.1",
+    "@earendil-works/pi-tui": "^0.79.1",
     "@types/node": "^25.5.2",
     "typebox": "^1.1.33",
     "typescript": "^6.0.2"

package/src/doctor.js

@@ -49,7 +49,7 @@ export async function runDoctor({ version, cwd = process.cwd() } = {}) {
   console.log(pc.cyan('\nRecommendations\n'));
 
   if (!report.pi.installed) {
-    console.log(pc.white('  - Install Pi first: npm install -g @mariozechner/pi-coding-agent'));
+    console.log(pc.white('  - Install Pi first: npm install -g @earendil-works/pi-coding-agent'));
   }
 
   if (!report.bundled.packageIncluded) {

package/src/pi-harness.js

@@ -209,8 +209,26 @@ export async function inspectInstalledTakomiPiHarness(home = HOME) {
   };
 }
 
-function runCommand(command, args) {
-  return spawnSync(command, args, { stdio: 'pipe', encoding: 'utf8', shell: process.platform === 'win32' });
+function quoteWindowsCommandArg(value) {
+  const text = String(value);
+  if (text.length === 0) return '""';
+  if (!/[\s"&|<>^()%!]/.test(text)) return text;
+  return `"${text.replace(/"/g, '\\"')}"`;
+}
+
+function resolveCommandForSpawn(command, args = []) {
+  if (process.platform !== 'win32') return { command, args };
+  if (/\.(exe|com)$/i.test(command)) return { command, args };
+
+  return {
+    command: 'cmd.exe',
+    args: ['/d', '/s', '/c', [command, ...args].map(quoteWindowsCommandArg).join(' ')],
+  };
+}
+
+export function runCommand(command, args) {
+  const resolved = resolveCommandForSpawn(command, args);
+  return spawnSync(resolved.command, resolved.args, { stdio: 'pipe', encoding: 'utf8', shell: false });
 }
 
 function runCommandWithTimeout(command, args, timeoutMs) {
@@ -220,9 +238,10 @@ function runCommandWithTimeout(command, args, timeoutMs) {
     let settled = false;
     let timedOut = false;
 
-    const child = spawn(command, args, {
+    const resolved = resolveCommandForSpawn(command, args);
+    const child = spawn(resolved.command, resolved.args, {
       stdio: ['ignore', 'pipe', 'pipe'],
-      shell: process.platform === 'win32',
+      shell: false,
       windowsHide: true,
     });
 
@@ -235,10 +254,17 @@ function runCommandWithTimeout(command, args, timeoutMs) {
 
     const timer = setTimeout(() => {
       timedOut = true;
-      try { child.kill(); } catch {}
-      setTimeout(() => {
-        try { child.kill('SIGKILL'); } catch {}
-      }, 1500).unref?.();
+      if (process.platform === 'win32' && child.pid) {
+        try { spawnSync('taskkill', ['/pid', String(child.pid), '/t', '/f'], { stdio: 'ignore' }); } catch {}
+      } else {
+        try { child.kill(); } catch {}
+        setTimeout(() => {
+          try { child.kill('SIGKILL'); } catch {}
+        }, 1500).unref?.();
+      }
+      try { child.stdout?.destroy(); } catch {}
+      try { child.stderr?.destroy(); } catch {}
+      finish({ status: null });
     }, timeoutMs);
     timer.unref?.();
 
@@ -258,9 +284,6 @@ export async function ensurePiInstalled() {
   const attempts = [
     { command: 'npm', args: ['install', '-g', '@earendil-works/pi-coding-agent'] },
     { command: 'npm.cmd', args: ['install', '-g', '@earendil-works/pi-coding-agent'] },
-    // Legacy fallback for older environments that still publish under the original namespace.
-    { command: 'npm', args: ['install', '-g', '@mariozechner/pi-coding-agent'] },
-    { command: 'npm.cmd', args: ['install', '-g', '@mariozechner/pi-coding-agent'] },
   ];
 
   let lastError = 'Unknown install failure.';

package/src/pi-optional-features.js

@@ -1,8 +1,7 @@
 import fs from 'fs-extra';
-import { spawnSync } from 'child_process';
 import prompts from 'prompts';
 import pc from 'picocolors';
-import { detectPiCommand, getPiGlobalTargets } from './pi-harness.js';
+import { detectPiCommand, getPiGlobalTargets, runCommand } from './pi-harness.js';
 
 export const TAKOMI_PI_OPTIONAL_FEATURES = [
   {
@@ -43,10 +42,6 @@ export const TAKOMI_PI_OPTIONAL_FEATURES = [
   },
 ];
 
-function runCommand(command, args) {
-  return spawnSync(command, args, { stdio: 'pipe', encoding: 'utf8', shell: process.platform === 'win32' });
-}
-
 function packageIdentity(packageSpec) {
   if (!packageSpec.startsWith('npm:')) return packageSpec;
   const withoutPrefix = packageSpec.slice(4);