@melihmucuk/pi-crew 1.0.11 → 1.0.12

package/README.md

@@ -58,7 +58,7 @@ Supported modes:
 "abort all active subagents"
 ```
 
-Tool-triggered aborts are reported back as steering messages with the reason `Aborted by tool request`.
+Tool-triggered aborts are reported back as steering messages with the reason `Aborted by tool request`. User-command aborts and shutdown-triggered aborts use distinct reasons.
 
 ### `crew_respond`
 
@@ -195,6 +195,8 @@ Override values replace the matching frontmatter fields for the named subagent a
 
 When the current session owns active subagents, a live status widget appears in the TUI for that session, showing each subagent's ID, model, turn count, and context token usage.
 
+On session replacement paths such as `/new`, `/resume`, `/fork`, and `/reload`, subagents keep running and reconnect to the owner session when it becomes active again. On real quit, pi-crew aborts running subagents during shutdown.
+
 ```
 ⠹ scout-a1b2 (claude-haiku-4-5) · turn 3 · 12.5k ctx
 ⠸ worker-c3d4 (claude-sonnet-4-6) · turn 7 · 45.2k ctx

package/dist/bootstrap-session.d.ts

@@ -4,6 +4,7 @@ import type { AgentConfig } from "./agent-discovery.js";
 export interface BootstrapContext {
     model: Model<Api> | undefined;
     modelRegistry: ModelRegistry;
+    agentDir: string;
     parentSessionFile?: string;
 }
 interface BootstrapOptions {

package/dist/bootstrap-session.js

@@ -1,7 +1,7 @@
 import { createAgentSession, DefaultResourceLoader, SessionManager, SettingsManager, } from "@mariozechner/pi-coding-agent";
-import { createSupportedTools, SUPPORTED_TOOL_NAMES } from "./tool-registry.js";
-function resolveTools(agentConfig, cwd) {
-    return createSupportedTools(agentConfig.tools ?? SUPPORTED_TOOL_NAMES, cwd);
+import { SUPPORTED_TOOL_NAMES } from "./tool-registry.js";
+function resolveTools(agentConfig) {
+    return [...(agentConfig.tools ?? SUPPORTED_TOOL_NAMES)];
 }
 function resolveModel(agentConfig, ctx) {
     const warnings = [];
@@ -33,9 +33,10 @@ export async function bootstrapSession(opts) {
     const modelRegistry = ctx.modelRegistry;
     const { model, warnings: modelWarnings } = resolveModel(agentConfig, ctx);
     warnings.push(...modelWarnings);
-    const tools = resolveTools(agentConfig, cwd);
+    const tools = resolveTools(agentConfig);
     const resourceLoader = new DefaultResourceLoader({
         cwd,
+        agentDir: ctx.agentDir,
         extensionsOverride: (base) => ({
             ...base,
             extensions: base.extensions.filter((ext) => !ext.resolvedPath.startsWith(extensionResolvedPath)),
@@ -59,6 +60,7 @@ export async function bootstrapSession(opts) {
     sessionManager.newSession({ parentSession: ctx.parentSessionFile });
     const result = await createAgentSession({
         cwd,
+        agentDir: ctx.agentDir,
         model,
         thinkingLevel: agentConfig.thinking,
         tools,

package/dist/index.js

@@ -10,13 +10,10 @@ function setupProcessHooks() {
     if (processHooksSetup)
         return;
     processHooksSetup = true;
-    const abortAndExit = (signal) => {
+    process.once('SIGINT', () => {
         crewRuntime.abortAll();
-        // Re-raise to restore default Node termination behavior
-        process.exit(128 + (signal === 'SIGINT' ? 2 : 15));
-    };
-    process.once('SIGINT', () => abortAndExit('SIGINT'));
-    process.once('SIGTERM', () => abortAndExit('SIGTERM'));
+        process.exit(130);
+    });
     process.on('beforeExit', () => crewRuntime.abortAll());
 }
 export default function (pi) {
@@ -38,20 +35,12 @@ export default function (pi) {
     pi.on("session_start", (_event, ctx) => {
         activateSession(ctx);
     });
-    pi.on("session_before_switch", () => {
-        // Session is about to switch - no action needed here.
-        // Subagent cleanup is handled by process hooks, not session_shutdown.
-    });
-    pi.on("session_before_fork", () => {
-        // Session is about to fork - no action needed here.
-        // Subagent cleanup is handled by process hooks, not session_shutdown.
-    });
-    pi.on("session_shutdown", (_event, ctx) => {
+    pi.on("session_shutdown", (event, ctx) => {
         const sessionId = ctx.sessionManager.getSessionId();
-        // Deactivate delivery to this session, but don't abort subagents.
-        // Subagents continue running and will complete normally.
-        // Real cleanup happens in process exit hooks.
         crewRuntime.deactivateSession(sessionId);
+        if (event.reason === "quit") {
+            crewRuntime.abortAll();
+        }
     });
     registerCrewIntegration(pi, crewRuntime, extensionDir);
 }

package/dist/integration/tools/crew-spawn.js

@@ -1,3 +1,4 @@
+import { getAgentDir } from "@mariozechner/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
 import { discoverAgents } from "../../agent-discovery.js";
 import { renderCrewCall, renderCrewResult, toolError, toolSuccess, } from "../tool-presentation.js";
@@ -31,6 +32,7 @@ export function registerCrewSpawnTool({ pi, crew, extensionDir, notifyDiscoveryW
             const id = crew.spawn(subagent, params.task, ctx.cwd, ownerSessionId, {
                 model: ctx.model,
                 modelRegistry: ctx.modelRegistry,
+                agentDir: getAgentDir(),
                 parentSessionFile: ctx.sessionManager.getSessionFile(),
                 onWarning: (msg) => ctx.ui.notify(msg, "warning"),
             }, extensionDir);

package/dist/runtime/crew-runtime.d.ts

@@ -15,6 +15,7 @@ interface AbortOptions {
 export interface SpawnContext {
     model: Model<Api> | undefined;
     modelRegistry: ModelRegistry;
+    agentDir: string;
     parentSessionFile?: string;
     onWarning?: (message: string) => void;
 }
@@ -50,8 +51,8 @@ declare class CrewRuntime {
     abortOwned(ids: string[], callerSessionId: string, opts: AbortOptions): AbortOwnedResult;
     abortAllOwned(callerSessionId: string, opts: AbortOptions): string[];
     /**
-     * Abort all running subagents (process-level cleanup).
-     * Called from process exit hooks.
+     * Abort all running subagents during shutdown cleanup.
+     * Called from SIGINT, session_shutdown(reason="quit"), and beforeExit fallback paths.
      */
     abortAll(): void;
     getAbortableAgents(): AbortableAgentSummary[];

package/dist/runtime/crew-runtime.js

@@ -7,6 +7,7 @@ function toBootstrapContext(ctx) {
     return {
         model: ctx.model,
         modelRegistry: ctx.modelRegistry,
+        agentDir: ctx.agentDir,
         parentSessionFile: ctx.parentSessionFile,
     };
 }
@@ -265,13 +266,13 @@ class CrewRuntime {
         return ids;
     }
     /**
-     * Abort all running subagents (process-level cleanup).
-     * Called from process exit hooks.
+     * Abort all running subagents during shutdown cleanup.
+     * Called from SIGINT, session_shutdown(reason="quit"), and beforeExit fallback paths.
      */
     abortAll() {
         const allAgents = this.registry.getAllRunning();
         for (const state of allAgents) {
-            this.abort(state.id, { reason: "Aborted on process exit" });
+            this.abort(state.id, { reason: "Aborted during shutdown" });
         }
     }
     getAbortableAgents() {

package/dist/tool-registry.d.ts

@@ -1,76 +1,5 @@
-declare const TOOL_FACTORIES: {
-    read: (cwd: string) => import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-        path: import("@sinclair/typebox").TString;
-        offset: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-        limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    }>, any>;
-    bash: (cwd: string) => import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-        command: import("@sinclair/typebox").TString;
-        timeout: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    }>, any>;
-    edit: (cwd: string) => import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-        path: import("@sinclair/typebox").TString;
-        edits: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
-            oldText: import("@sinclair/typebox").TString;
-            newText: import("@sinclair/typebox").TString;
-        }>>;
-    }>, any>;
-    write: (cwd: string) => import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-        path: import("@sinclair/typebox").TString;
-        content: import("@sinclair/typebox").TString;
-    }>, any>;
-    grep: (cwd: string) => import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-        pattern: import("@sinclair/typebox").TString;
-        path: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-        glob: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-        ignoreCase: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
-        literal: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
-        context: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-        limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    }>, any>;
-    find: (cwd: string) => import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-        pattern: import("@sinclair/typebox").TString;
-        path: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-        limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    }>, any>;
-    ls: (cwd: string) => import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-        path: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-        limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    }>, any>;
-};
-export type SupportedToolName = keyof typeof TOOL_FACTORIES;
+declare const SUPPORTED_TOOL_NAMES_LITERAL: readonly ["read", "bash", "edit", "write", "grep", "find", "ls"];
+export type SupportedToolName = (typeof SUPPORTED_TOOL_NAMES_LITERAL)[number];
 export declare const SUPPORTED_TOOL_NAMES: readonly ("read" | "bash" | "edit" | "write" | "grep" | "find" | "ls")[];
 export declare function isSupportedToolName(name: string): name is SupportedToolName;
-export declare function createSupportedTools(toolNames: readonly SupportedToolName[], cwd: string): (import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-    path: import("@sinclair/typebox").TString;
-    offset: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-}>, any> | import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-    command: import("@sinclair/typebox").TString;
-    timeout: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-}>, any> | import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-    path: import("@sinclair/typebox").TString;
-    edits: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
-        oldText: import("@sinclair/typebox").TString;
-        newText: import("@sinclair/typebox").TString;
-    }>>;
-}>, any> | import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-    path: import("@sinclair/typebox").TString;
-    content: import("@sinclair/typebox").TString;
-}>, any> | import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-    pattern: import("@sinclair/typebox").TString;
-    path: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    glob: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    ignoreCase: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
-    literal: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
-    context: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-    limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-}>, any> | import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-    pattern: import("@sinclair/typebox").TString;
-    path: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-}>, any> | import("@mariozechner/pi-agent-core").AgentTool<import("@sinclair/typebox").TObject<{
-    path: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-}>, any>)[];
 export {};

package/dist/tool-registry.js

@@ -1,17 +1,13 @@
-import { createBashTool, createEditTool, createFindTool, createGrepTool, createLsTool, createReadTool, createWriteTool, } from "@mariozechner/pi-coding-agent";
-const TOOL_FACTORIES = {
-    read: (cwd) => createReadTool(cwd),
-    bash: (cwd) => createBashTool(cwd),
-    edit: (cwd) => createEditTool(cwd),
-    write: (cwd) => createWriteTool(cwd),
-    grep: (cwd) => createGrepTool(cwd),
-    find: (cwd) => createFindTool(cwd),
-    ls: (cwd) => createLsTool(cwd),
-};
-export const SUPPORTED_TOOL_NAMES = Object.freeze(Object.keys(TOOL_FACTORIES));
+const SUPPORTED_TOOL_NAMES_LITERAL = [
+    "read",
+    "bash",
+    "edit",
+    "write",
+    "grep",
+    "find",
+    "ls",
+];
+export const SUPPORTED_TOOL_NAMES = Object.freeze([...SUPPORTED_TOOL_NAMES_LITERAL]);
 export function isSupportedToolName(name) {
-    return name in TOOL_FACTORIES;
-}
-export function createSupportedTools(toolNames, cwd) {
-    return toolNames.map((toolName) => TOOL_FACTORIES[toolName](cwd));
+    return SUPPORTED_TOOL_NAMES.includes(name);
 }

package/docs/architecture.md

@@ -20,7 +20,7 @@ Primary components:
 
 ### 2.1 CrewRuntime singleton
 
-`CrewRuntime` is a process-level singleton that survives pi runtime replacement (`/resume`, `/new`, `/fork`). When pi discards an old extension instance and creates a new one, the new instance reconnects to the same `crewRuntime` and picks up existing subagent state.
+`CrewRuntime` is a process-level singleton that survives pi runtime replacement (`/resume`, `/new`, `/fork`, `/reload`). When pi discards an old extension instance and creates a new one, the new instance reconnects to the same `crewRuntime` and picks up existing subagent state.
 
 Responsibilities:
 
@@ -35,7 +35,7 @@ Routes subagent results to the correct session at the correct time. Key behavior
 
 - Tracks active session via `ActiveRuntimeBinding` (set on `session_start`, cleared on `session_shutdown`)
 - Queues results when owner session is inactive
-- Flushes queued results when owner session activates (`session_start` with `reason: "resume"` or `"fork"`)
+- Flushes queued results when owner session activates on any `session_start`; resume/fork are the important replacement paths because subagents survive runtime replacement within the same process
 - Uses `triggerTurn: false/true` split to preserve ordering between `crew-result` and `crew-remaining`
 
 Underlying delivery: see pi's `sendMessage({ deliverAs, triggerTurn })` in extensions.md.
@@ -115,7 +115,7 @@ Invariants:
 
 1. `crew_list`, `crew_abort`, `crew_respond`, `crew_done`, status widget: session-scoped. Only owner sees/controls.
 2. `/pi-crew-abort`: cross-session emergency escape hatch.
-3. `session_shutdown` deactivates delivery binding only; subagents continue running. Abort happens on process exit.
+3. `session_shutdown` always deactivates delivery binding. On replacement paths (`reload`, `new`, `resume`, `fork`), subagents continue running. On `quit`, the extension aborts all running subagents. `SIGINT` also aborts via a process hook, and `beforeExit` remains a fallback.
 
 ## 7. Subagent definition model
 
@@ -147,6 +147,7 @@ JSON overrides: `~/.pi/agent/pi-crew.json` (global), `<cwd>/.pi/pi-crew.json` (p
 7. `crew-result` messages appear before `crew-remaining` notes (ordering via `triggerTurn` split).
 8. Pending messages preserved for inactive sessions; TTL (24h) prevents memory leak.
 9. Active subagent state survives runtime replacement within same process.
+10. Graceful quit aborts subagents through `session_shutdown.reason === "quit"`; replacement paths do not.
 
 ## 9. Reading guide
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@melihmucuk/pi-crew",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "type": "module",
   "description": "Non-blocking subagent orchestration for pi coding agent",
   "files": [
@@ -42,10 +42,10 @@
     "@sinclair/typebox": "*"
   },
   "devDependencies": {
-    "@mariozechner/pi-agent-core": "^0.65.0",
-    "@mariozechner/pi-ai": "^0.65.0",
-    "@mariozechner/pi-coding-agent": "^0.65.0",
-    "@mariozechner/pi-tui": "^0.65.0",
+    "@mariozechner/pi-agent-core": "^0.68.0",
+    "@mariozechner/pi-ai": "^0.68.0",
+    "@mariozechner/pi-coding-agent": "^0.68.0",
+    "@mariozechner/pi-tui": "^0.68.0",
     "@sinclair/typebox": "^0.34.49",
     "@types/node": "^22.19.17",
     "typescript": "^5.9.3"