@a5c-ai/babysitter-sdk 0.0.184 → 0.0.185

package/dist/cli/commands/instructions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/instructions.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAkBH,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,eAAe,GAAG,gBAAgB,GAAG,aAAa,GAAG,qBAAqB,CAAC;IACvF,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,OAAO,CAAC;CACf;AA4GD;;GAEG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,uBAAuB,GAC5B,OAAO,CAAC,MAAM,CAAC,CAiEjB"}
+{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/instructions.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAoBH,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,eAAe,GAAG,gBAAgB,GAAG,aAAa,GAAG,qBAAqB,CAAC;IACvF,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,OAAO,CAAC;CACf;AAmID;;GAEG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,uBAAuB,GAC5B,OAAO,CAAC,MAAM,CAAC,CAmFjB"}

package/dist/cli/commands/instructions.js

@@ -9,9 +9,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleInstructionsCommand = handleInstructionsCommand;
+const node_fs_1 = require("node:fs");
 const prompts_1 = require("../../prompts");
 const active_1 = require("../../processLibrary/active");
 const registry_1 = require("../../harness/registry");
+const parse_1 = require("../../session/parse");
 /**
  * Legacy fallback map — used only when an adapter does not implement
  * `getPromptContext()`.  New harnesses should add the method to their
@@ -103,6 +105,28 @@ async function tryResolveProcessLibraryRoot() {
     }
     return {};
 }
+/**
+ * Detect whether the session-start hook has actually run by checking for the
+ * session state file it creates (`<stateDir>/<sessionId>.md`).
+ *
+ * Some adapters can resolve a session ID from env vars alone (e.g.
+ * GEMINI_SESSION_ID, CODEX_SESSION_ID) without the hook ever firing.
+ * The definitive signal is the state file — the hook writes it as a
+ * side effect of `babysitter hook:run --hook-type session-start`.
+ */
+function detectHooksActive(harness) {
+    const adapter = (0, registry_1.getAdapterByName)(harness);
+    if (!adapter)
+        return false;
+    const sessionId = adapter.resolveSessionId({});
+    if (!sessionId)
+        return false;
+    const stateDir = adapter.resolveStateDir({});
+    if (!stateDir)
+        return false;
+    const stateFile = (0, parse_1.getSessionFilePath)(stateDir, sessionId);
+    return (0, node_fs_1.existsSync)(stateFile);
+}
 /**
  * Route and handle an `instructions:*` subcommand.
  */
@@ -137,9 +161,18 @@ async function handleInstructionsCommand(args) {
     }
     // Resolve the active process-library root before composing the prompt
     const libraryInfo = await tryResolveProcessLibraryRoot();
+    // Detect whether hooks are actually active in this session.
+    // If the session-start hook never ran (no breadcrumb file), override
+    // hookDriven to false so the agent drives the loop in-turn.
+    const hooksActive = detectHooksActive(args.harness);
+    const hookOverride = {};
+    if (!hooksActive) {
+        hookOverride.hookDriven = false;
+    }
     const ctx = factory({
         interactive: args.interactive,
         ...libraryInfo,
+        ...hookOverride,
     });
     const content = composer.fn(ctx);
     if (args.json) {
@@ -147,11 +180,19 @@ async function handleInstructionsCommand(args) {
             harness: args.harness,
             interactive: args.interactive,
             promptType: composer.promptType,
+            hookDriven: ctx.hookDriven,
+            hooksDetected: hooksActive,
             content,
             partsIncluded: composer.partsIncluded,
         }, null, 2));
     }
     else {
+        if (!hooksActive && ctx.hookDriven !== false) {
+            // Context factory defaulted hookDriven to true, but we overrode it.
+            // This is a no-op because the override already happened, but it
+            // clarifies the JSON output. The text output is self-explanatory
+            // from the generated instructions.
+        }
         console.log(content);
     }
     return 0;

package/dist/cli/main.js

@@ -334,7 +334,7 @@ function parseArgs(argv) {
         // Session command flags
         if (arg === "--session-id") {
             // Tolerate empty/missing value — the harness adapter can auto-detect
-            // session ID from CLAUDE_ENV_FILE or CLAUDE_SESSION_ID env var.
+            // session ID from BABYSITTER_SESSION_ID env var or CLAUDE_ENV_FILE.
             const next = rest[i + 1];
             if (next && !next.startsWith("-")) {
                 parsed.sessionId = next;
@@ -1071,7 +1071,7 @@ async function handleRunCreate(parsed) {
                 harness: parsed.harness ?? adapter.name,
                 sessionId: "",
                 error: (adapter.getMissingSessionIdHint?.() ??
-                    "No session ID provided. Use --session-id or set CLAUDE_SESSION_ID."),
+                    "No session ID provided. Use --session-id or set BABYSITTER_SESSION_ID."),
             };
         }
     }

package/dist/config/defaults.d.ts

@@ -111,6 +111,17 @@ export declare const CONFIG_ENV_VARS: {
  * They can be overridden via environment variables or explicit config.
  */
 export declare const DEFAULTS: Readonly<BabysitterConfig>;
+/**
+ * Returns the global babysitter state directory (~/.a5c/state/).
+ *
+ * All harness adapters use this as the canonical default location for session
+ * state files. The directory is user-global (not workspace-relative or
+ * plugin-root-relative) so session state is discoverable regardless of the
+ * execution context (hook subprocess, Bash tool, CLI invocation, etc.).
+ *
+ * Override: set BABYSITTER_STATE_DIR to use a different path.
+ */
+export declare function getGlobalStateDir(): string;
 /**
  * Retrieves configuration with environment variable overrides merged in.
  *

package/dist/config/defaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEtE;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,QAAQ,EAAE,QAAQ,CAAC;IAEnB;;;OAGG;IACH,eAAe,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,uBAAuB,EAAE,MAAM,CAAC;CACjC;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,KAAK,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAC;IAEjB;;OAEG;IACH,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;CASlB,CAAC;AAEX;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,gBAAgB,CAwEtC,CAAC;AAiDX;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,SAAS,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,CAqCjF;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,gBAAgB,GAAG,sBAAsB,CA2E/E;AAED;;;;GAIG;AACH,wBAAgB,WAAW,IAAI,QAAQ,CAAC,gBAAgB,CAAC,CAExD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,QAAQ,CAEjE"}
+{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEtE;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,QAAQ,EAAE,QAAQ,CAAC;IAEnB;;;OAGG;IACH,eAAe,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,aAAa,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,uBAAuB,EAAE,MAAM,CAAC;CACjC;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,KAAK,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAC;IAEjB;;OAEG;IACH,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;CASlB,CAAC;AAEX;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,gBAAgB,CAwEtC,CAAC;AAEX;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,IAAI,MAAM,CAQ1C;AAiDD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,SAAS,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,CAqCjF;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,gBAAgB,GAAG,sBAAsB,CA2E/E;AAED;;;;GAIG;AACH,wBAAgB,WAAW,IAAI,QAAQ,CAAC,gBAAgB,CAAC,CAExD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,QAAQ,CAEjE"}

package/dist/config/defaults.js

@@ -6,12 +6,48 @@
  * values used throughout the babysitter SDK. Import from here instead of using
  * scattered magic numbers and strings.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULTS = exports.CONFIG_ENV_VARS = void 0;
+exports.getGlobalStateDir = getGlobalStateDir;
 exports.getConfig = getConfig;
 exports.validateConfig = validateConfig;
 exports.getDefaults = getDefaults;
 exports.isValidLogLevel = isValidLogLevel;
+const path = __importStar(require("node:path"));
+const os = __importStar(require("node:os"));
 /**
  * Environment variable names for configuration overrides
  */
@@ -93,6 +129,25 @@ exports.DEFAULTS = {
      */
     largeResultPreviewLimit: 1024 * 1024,
 };
+/**
+ * Returns the global babysitter state directory (~/.a5c/state/).
+ *
+ * All harness adapters use this as the canonical default location for session
+ * state files. The directory is user-global (not workspace-relative or
+ * plugin-root-relative) so session state is discoverable regardless of the
+ * execution context (hook subprocess, Bash tool, CLI invocation, etc.).
+ *
+ * Override: set BABYSITTER_STATE_DIR to use a different path.
+ */
+function getGlobalStateDir() {
+    if (process.env.BABYSITTER_STATE_DIR) {
+        return path.resolve(process.env.BABYSITTER_STATE_DIR);
+    }
+    const globalRoot = process.env.BABYSITTER_GLOBAL_STATE_DIR?.trim()
+        ? path.resolve(process.env.BABYSITTER_GLOBAL_STATE_DIR)
+        : path.join(os.homedir(), ".a5c");
+    return path.join(globalRoot, "state");
+}
 /**
  * Valid log levels for validation
  */

package/dist/config/index.d.ts

@@ -21,5 +21,5 @@
  * }
  * ```
  */
-export { type LogLevel, type BabysitterConfig, type ConfigValidationResult, DEFAULTS, CONFIG_ENV_VARS, getConfig, validateConfig, getDefaults, isValidLogLevel, } from "./defaults";
+export { type LogLevel, type BabysitterConfig, type ConfigValidationResult, DEFAULTS, CONFIG_ENV_VARS, getConfig, getGlobalStateDir, validateConfig, getDefaults, isValidLogLevel, } from "./defaults";
 //# sourceMappingURL=index.d.ts.map

package/dist/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAG3B,QAAQ,EACR,eAAe,EAGf,SAAS,EACT,cAAc,EACd,WAAW,EACX,eAAe,GAChB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAG3B,QAAQ,EACR,eAAe,EAGf,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,eAAe,GAChB,MAAM,YAAY,CAAC"}

package/dist/config/index.js

@@ -23,13 +23,14 @@
  * ```
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidLogLevel = exports.getDefaults = exports.validateConfig = exports.getConfig = exports.CONFIG_ENV_VARS = exports.DEFAULTS = void 0;
+exports.isValidLogLevel = exports.getDefaults = exports.validateConfig = exports.getGlobalStateDir = exports.getConfig = exports.CONFIG_ENV_VARS = exports.DEFAULTS = void 0;
 var defaults_1 = require("./defaults");
 // Constants
 Object.defineProperty(exports, "DEFAULTS", { enumerable: true, get: function () { return defaults_1.DEFAULTS; } });
 Object.defineProperty(exports, "CONFIG_ENV_VARS", { enumerable: true, get: function () { return defaults_1.CONFIG_ENV_VARS; } });
 // Functions
 Object.defineProperty(exports, "getConfig", { enumerable: true, get: function () { return defaults_1.getConfig; } });
+Object.defineProperty(exports, "getGlobalStateDir", { enumerable: true, get: function () { return defaults_1.getGlobalStateDir; } });
 Object.defineProperty(exports, "validateConfig", { enumerable: true, get: function () { return defaults_1.validateConfig; } });
 Object.defineProperty(exports, "getDefaults", { enumerable: true, get: function () { return defaults_1.getDefaults; } });
 Object.defineProperty(exports, "isValidLogLevel", { enumerable: true, get: function () { return defaults_1.isValidLogLevel; } });

package/dist/harness/claudeCode.d.ts

@@ -2,9 +2,9 @@
  * Claude Code harness adapter.
  *
  * Centralizes all Claude Code-specific behaviors:
- *   - Session ID resolution (CLAUDE_SESSION_ID, CLAUDE_ENV_FILE)
+ *   - Session ID resolution (BABYSITTER_SESSION_ID via CLAUDE_ENV_FILE)
  *   - Plugin root resolution (CLAUDE_PLUGIN_ROOT)
- *   - State directory conventions (pluginRoot/skills/babysit/state)
+ *   - State directory conventions (~/.a5c/state/)
  *   - Session binding (run:create → state file with run association)
  *   - Stop hook handler (approve/block decision)
  *   - Session-start hook handler (env file + baseline state file)

package/dist/harness/claudeCode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claudeCode.d.ts","sourceRoot":"","sources":["../../src/harness/claudeCode.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AA+BH,OAAO,KAAK,EACV,cAAc,EAMf,MAAM,SAAS,CAAC;AAmlCjB,wBAAgB,uBAAuB,IAAI,cAAc,CA4ExD"}
+{"version":3,"file":"claudeCode.d.ts","sourceRoot":"","sources":["../../src/harness/claudeCode.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AA+BH,OAAO,KAAK,EACV,cAAc,EAMf,MAAM,SAAS,CAAC;AA+jCjB,wBAAgB,uBAAuB,IAAI,cAAc,CA4ExD"}

package/dist/harness/claudeCode.js

@@ -3,9 +3,9 @@
  * Claude Code harness adapter.
  *
  * Centralizes all Claude Code-specific behaviors:
- *   - Session ID resolution (CLAUDE_SESSION_ID, CLAUDE_ENV_FILE)
+ *   - Session ID resolution (BABYSITTER_SESSION_ID via CLAUDE_ENV_FILE)
  *   - Plugin root resolution (CLAUDE_PLUGIN_ROOT)
- *   - State directory conventions (pluginRoot/skills/babysit/state)
+ *   - State directory conventions (~/.a5c/state/)
  *   - Session binding (run:create → state file with run association)
  *   - Stop hook handler (approve/block decision)
  *   - Session-start hook handler (env file + baseline state file)
@@ -58,6 +58,7 @@ const skill_1 = require("../cli/commands/skill");
 const session_1 = require("../session");
 const session_2 = require("../cli/commands/session");
 const context_1 = require("../prompts/context");
+const config_1 = require("../config");
 const config_loader_1 = require("../compression/config-loader");
 const density_filter_1 = require("../compression/density-filter");
 const library_cache_1 = require("../compression/library-cache");
@@ -179,16 +180,19 @@ async function cleanupSession(filePath) {
 /**
  * Resolve the current session ID from environment, independent of the hook
  * payload. After `/clear`, the hook payload may carry a stale session ID while
- * CLAUDE_SESSION_ID or CLAUDE_ENV_FILE reflects the actual active session.
+ * BABYSITTER_SESSION_ID (persisted via CLAUDE_ENV_FILE) reflects the actual
+ * active session.
  */
 function resolveCurrentSessionIdFromEnv() {
-    if (process.env.CLAUDE_SESSION_ID)
-        return process.env.CLAUDE_SESSION_ID;
+    // Cross-harness standard env var (written by session-start hook to CLAUDE_ENV_FILE)
+    if (process.env.BABYSITTER_SESSION_ID)
+        return process.env.BABYSITTER_SESSION_ID;
+    // Fallback: read BABYSITTER_SESSION_ID from CLAUDE_ENV_FILE directly
     const envFile = process.env.CLAUDE_ENV_FILE;
     if (envFile) {
         try {
             const content = (0, node_fs_1.readFileSync)(envFile, "utf-8");
-            const match = content.match(/export CLAUDE_SESSION_ID="([^"]+)"/);
+            const match = content.match(/export BABYSITTER_SESSION_ID="([^"]+)"/);
             if (match?.[1])
                 return match[1];
         }
@@ -237,7 +241,7 @@ async function handleStopHookImpl(args) {
     const resolvedPluginRoot = pluginRoot ? path.resolve(pluginRoot) : "";
     const stateDir = args.stateDir
         ? path.resolve(args.stateDir)
-        : (resolvedPluginRoot ? path.resolve(resolvedPluginRoot, "skills", "babysit", "state") : "");
+        : (0, config_1.getGlobalStateDir)();
     if (!stateDir) {
         log.warn("Cannot determine state directory — allowing exit");
         if (verbose) {
@@ -249,59 +253,42 @@ async function handleStopHookImpl(args) {
     log.info(`Resolved pluginRoot: ${resolvedPluginRoot || "(empty)"}`);
     log.info(`Resolved stateDir: ${stateDir}`);
     const runsDir = (0, resolveInputPath_1.collapseDoubledA5cRuns)(path.resolve(args.runsDir || ".a5c/runs"));
-    // 3. Check iteration — try primary stateDir, then fallback to .a5c/state/
+    // 3. Check iteration — look up session state file in the resolved stateDir
     let filePath = (0, session_1.getSessionFilePath)(stateDir, sessionId);
     log.info(`Checking session file at: ${filePath}`);
     let sessionFile;
     try {
         if (!(await (0, session_1.sessionFileExists)(filePath))) {
-            // Fallback: check .a5c/state/ directory
-            const fallbackStateDir = path.resolve(".a5c", "state");
-            const fallbackPath = (0, session_1.getSessionFilePath)(fallbackStateDir, sessionId);
-            log.info(`Primary state file not found, trying fallback: ${fallbackPath}`);
-            if (await (0, session_1.sessionFileExists)(fallbackPath)) {
-                filePath = fallbackPath;
-                log.info(`Found session file at fallback path: ${filePath}`);
-            }
-            else {
-                // Fallback: the hook payload may carry a stale session ID (e.g. after
-                // /clear). Try resolving the *current* session ID from CLAUDE_SESSION_ID
-                // or CLAUDE_ENV_FILE and retry the lookup if it differs.
-                const envSessionId = resolveCurrentSessionIdFromEnv();
-                if (envSessionId && envSessionId !== sessionId) {
-                    log.info(`Payload session ${sessionId} is stale; current env session is ${envSessionId} — retrying lookup`);
-                    const primaryRetry = (0, session_1.getSessionFilePath)(stateDir, envSessionId);
-                    const fallbackRetry = (0, session_1.getSessionFilePath)(fallbackStateDir, envSessionId);
-                    if (await (0, session_1.sessionFileExists)(primaryRetry)) {
-                        filePath = primaryRetry;
-                        sessionId = envSessionId;
-                        log.setContext("session", sessionId);
-                        log.info(`Found session file for env session at primary: ${filePath}`);
-                    }
-                    else if (await (0, session_1.sessionFileExists)(fallbackRetry)) {
-                        filePath = fallbackRetry;
-                        sessionId = envSessionId;
-                        log.setContext("session", sessionId);
-                        log.info(`Found session file for env session at fallback: ${filePath}`);
-                    }
-                    else {
-                        log.info(`No active loop found for payload session ${sessionId} or env session ${envSessionId} — allowing exit`);
-                        if (verbose) {
-                            process.stderr.write(`[hook:run stop] No active loop found for session ${sessionId} or ${envSessionId}\n`);
-                        }
-                        process.stdout.write("{}\n");
-                        return 0;
-                    }
+            // Fallback: the hook payload may carry a stale session ID (e.g. after
+            // /clear). Try resolving the *current* session ID from BABYSITTER_SESSION_ID
+            // (persisted via CLAUDE_ENV_FILE) and retry the lookup if it differs.
+            const envSessionId = resolveCurrentSessionIdFromEnv();
+            if (envSessionId && envSessionId !== sessionId) {
+                log.info(`Payload session ${sessionId} is stale; current env session is ${envSessionId} — retrying lookup`);
+                const retryPath = (0, session_1.getSessionFilePath)(stateDir, envSessionId);
+                if (await (0, session_1.sessionFileExists)(retryPath)) {
+                    filePath = retryPath;
+                    sessionId = envSessionId;
+                    log.setContext("session", sessionId);
+                    log.info(`Found session file for env session: ${filePath}`);
                 }
                 else {
-                    log.info(`No active loop found at primary (${filePath}) or fallback (${fallbackPath}) — allowing exit`);
+                    log.info(`No active loop found for payload session ${sessionId} or env session ${envSessionId} — allowing exit`);
                     if (verbose) {
-                        process.stderr.write(`[hook:run stop] No active loop found for session ${sessionId}\n`);
+                        process.stderr.write(`[hook:run stop] No active loop found for session ${sessionId} or ${envSessionId}\n`);
                     }
                     process.stdout.write("{}\n");
                     return 0;
                 }
             }
+            else {
+                log.info(`No active loop found for session ${sessionId} — allowing exit`);
+                if (verbose) {
+                    process.stderr.write(`[hook:run stop] No active loop found for session ${sessionId}\n`);
+                }
+                process.stdout.write("{}\n");
+                return 0;
+            }
         }
         sessionFile = await (0, session_1.readSessionFile)(filePath);
     }
@@ -728,12 +715,13 @@ async function handleSessionStartHookImpl(args) {
         process.stdout.write("{}\n");
         return 0;
     }
-    // 2. If CLAUDE_ENV_FILE is set, append session ID export
+    // 2. If CLAUDE_ENV_FILE is set, persist BABYSITTER_SESSION_ID so subsequent
+    //    hooks (stop hook, Bash tool calls) can resolve it from the environment.
     let envFilePersisted = false;
     const envFile = process.env.CLAUDE_ENV_FILE;
     if (envFile) {
         try {
-            (0, node_fs_1.appendFileSync)(envFile, `export CLAUDE_SESSION_ID="${sessionId}"\n`);
+            (0, node_fs_1.appendFileSync)(envFile, `export BABYSITTER_SESSION_ID="${sessionId}"\n`);
             envFilePersisted = true;
         }
         catch {
@@ -748,7 +736,7 @@ async function handleSessionStartHookImpl(args) {
     const resolvedPluginRoot = pluginRoot ? path.resolve(pluginRoot) : "";
     const stateDir = args.stateDir
         ? path.resolve(args.stateDir)
-        : (resolvedPluginRoot ? path.resolve(resolvedPluginRoot, "skills", "babysit", "state") : "");
+        : (0, config_1.getGlobalStateDir)();
     let stateFilePersisted = false;
     if (stateDir) {
         const filePath = (0, session_1.getSessionFilePath)(stateDir, sessionId);
@@ -820,20 +808,9 @@ async function handleSessionStartHookImpl(args) {
 // Session binding (run:create flow)
 // ---------------------------------------------------------------------------
 async function bindSessionImpl(opts) {
-    const { sessionId, runId, pluginRoot, runsDir, maxIterations = 256, prompt, verbose } = opts;
+    const { sessionId, runId, pluginRoot: _pluginRoot, runsDir, maxIterations = 256, prompt, verbose } = opts;
     // Resolve state directory (always resolve to absolute paths)
-    const resolvedPluginRoot = pluginRoot ? path.resolve(pluginRoot) : "";
-    let stateDir = opts.stateDir ? path.resolve(opts.stateDir) : "";
-    if (!stateDir && resolvedPluginRoot) {
-        stateDir = path.resolve(resolvedPluginRoot, "skills", "babysit", "state");
-    }
-    if (!stateDir) {
-        return {
-            harness: "claude-code",
-            sessionId,
-            error: "Cannot bind session: --state-dir or --plugin-root required for claude-code harness",
-        };
-    }
+    const stateDir = opts.stateDir ? path.resolve(opts.stateDir) : (0, config_1.getGlobalStateDir)();
     const filePath = (0, session_1.getSessionFilePath)(stateDir, sessionId);
     // Check for existing session (prevent re-entrant runs)
     if (await (0, session_1.sessionFileExists)(filePath)) {
@@ -993,7 +970,7 @@ function createClaudeCodeAdapter() {
     return {
         name: "claude-code",
         isActive() {
-            return !!(process.env.CLAUDE_SESSION_ID || process.env.CLAUDE_ENV_FILE);
+            return !!(process.env.BABYSITTER_SESSION_ID || process.env.CLAUDE_ENV_FILE);
         },
         autoResolvesSessionId() {
             return true;
@@ -1001,14 +978,15 @@ function createClaudeCodeAdapter() {
         resolveSessionId(parsed) {
             if (parsed.sessionId)
                 return parsed.sessionId;
-            if (process.env.CLAUDE_SESSION_ID)
-                return process.env.CLAUDE_SESSION_ID;
-            // Fallback: read from CLAUDE_ENV_FILE (written by session-start hook)
+            // Cross-harness standard (written by session-start hook to CLAUDE_ENV_FILE)
+            if (process.env.BABYSITTER_SESSION_ID)
+                return process.env.BABYSITTER_SESSION_ID;
+            // Fallback: read BABYSITTER_SESSION_ID from CLAUDE_ENV_FILE directly
             const envFile = process.env.CLAUDE_ENV_FILE;
             if (envFile) {
                 try {
                     const content = (0, node_fs_1.readFileSync)(envFile, "utf-8");
-                    const match = content.match(/export CLAUDE_SESSION_ID="([^"]+)"/);
+                    const match = content.match(/export BABYSITTER_SESSION_ID="([^"]+)"/);
                     if (match?.[1])
                         return match[1];
                 }
@@ -1021,10 +999,7 @@ function createClaudeCodeAdapter() {
         resolveStateDir(args) {
             if (args.stateDir)
                 return path.resolve(args.stateDir);
-            const root = args.pluginRoot || process.env.CLAUDE_PLUGIN_ROOT;
-            if (root)
-                return path.resolve(root, "skills", "babysit", "state");
-            return undefined;
+            return (0, config_1.getGlobalStateDir)();
         },
         resolvePluginRoot(args) {
             const root = args.pluginRoot || process.env.CLAUDE_PLUGIN_ROOT;

package/dist/harness/codex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/harness/codex.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAaH,OAAO,KAAK,EACV,cAAc,EAMf,MAAM,SAAS,CAAC;AAkUjB,wBAAgB,kBAAkB,IAAI,cAAc,CAuGnD"}
+{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/harness/codex.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAaH,OAAO,KAAK,EACV,cAAc,EAMf,MAAM,SAAS,CAAC;AAkRjB,wBAAgB,kBAAkB,IAAI,cAAc,CAuGnD"}

package/dist/harness/codex.js

@@ -43,8 +43,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCodexAdapter = createCodexAdapter;
 const path = __importStar(require("node:path"));
-const node_fs_1 = require("node:fs");
 const node_stream_1 = require("node:stream");
+const config_1 = require("../config");
 const claudeCode_1 = require("./claudeCode");
 const session_1 = require("../session");
 const context_1 = require("../prompts/context");
@@ -56,49 +56,20 @@ function resolveCodexPluginRoot(args = {}) {
 function resolveCodexStateDir(args) {
     if (args.stateDir)
         return path.resolve(args.stateDir);
-    if (process.env.BABYSITTER_STATE_DIR) {
-        return path.resolve(process.env.BABYSITTER_STATE_DIR);
-    }
-    const pluginRoot = resolveCodexPluginRoot(args);
-    if (pluginRoot) {
-        const cwd = path.resolve(process.cwd());
-        const normalizedPluginRoot = path.resolve(pluginRoot);
-        // Workspace-local installs place ".codex" beside ".a5c", so derive from
-        // the plugin root only when that root lives under the active workspace.
-        if (normalizedPluginRoot === cwd ||
-            normalizedPluginRoot.startsWith(`${cwd}${path.sep}`)) {
-            return path.resolve(normalizedPluginRoot, "..", ".a5c");
-        }
-    }
-    if (pluginRoot) {
-        // Global Codex installs live under "~/.codex", but Babysitter run/session
-        // state must still default to the active workspace ".a5c".
-        // Falling through here keeps global skill installs honest.
-        return path.resolve(".a5c");
-    }
-    // Without any explicit state binding, Codex state belongs to the current
-    // workspace, not a user-global directory.
-    return path.resolve(".a5c");
+    return (0, config_1.getGlobalStateDir)();
 }
 function resolveCodexSessionId(parsed) {
     if (parsed.sessionId)
         return parsed.sessionId;
-    // Codex injects CODEX_THREAD_ID; keep CODEX_SESSION_ID as legacy fallback.
+    // Cross-harness standard
+    if (process.env.BABYSITTER_SESSION_ID)
+        return process.env.BABYSITTER_SESSION_ID;
+    // Codex-native env vars (auto-injected by Codex CLI into all hooks)
     if (process.env.CODEX_THREAD_ID)
         return process.env.CODEX_THREAD_ID;
     if (process.env.CODEX_SESSION_ID)
         return process.env.CODEX_SESSION_ID;
-    const envFile = process.env.CODEX_ENV_FILE;
-    if (!envFile)
-        return undefined;
-    try {
-        const content = (0, node_fs_1.readFileSync)(envFile, "utf-8");
-        const match = content.match(/(?:^|\n)\s*(?:export\s+)?(?:CODEX_THREAD_ID|CODEX_SESSION_ID)="([^"]+)"/);
-        return match?.[1] || undefined;
-    }
-    catch {
-        return undefined;
-    }
+    return undefined;
 }
 function readStdin() {
     return new Promise((resolve, reject) => {
@@ -205,17 +176,7 @@ async function handleCodexSessionStartHookImpl(args) {
         process.stdout.write("{}\n");
         return 0;
     }
-    const envFile = process.env.CODEX_ENV_FILE;
-    if (envFile) {
-        try {
-            (0, node_fs_1.appendFileSync)(envFile, `export CODEX_THREAD_ID="${sessionId}"\nexport CODEX_SESSION_ID="${sessionId}"\n`);
-        }
-        catch {
-            if (verbose) {
-                process.stderr.write(`[hook:run session-start] Failed to write to CODEX_ENV_FILE: ${envFile}\n`);
-            }
-        }
-    }
+    // Codex auto-injects CODEX_THREAD_ID into all hooks — no env file write needed.
     const stateDir = resolveCodexStateDir({
         stateDir: args.stateDir,
         pluginRoot: args.pluginRoot,
@@ -317,9 +278,9 @@ function createCodexAdapter() {
     return {
         name: "codex",
         isActive() {
-            return !!(process.env.CODEX_THREAD_ID ||
+            return !!(process.env.BABYSITTER_SESSION_ID ||
+                process.env.CODEX_THREAD_ID ||
                 process.env.CODEX_SESSION_ID ||
-                process.env.CODEX_ENV_FILE ||
                 process.env.CODEX_PLUGIN_ROOT);
         },
         autoResolvesSessionId() {

package/dist/harness/cursor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../src/harness/cursor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAsBH,OAAO,KAAK,EACV,cAAc,EAMf,MAAM,SAAS,CAAC;AA4wBjB,wBAAgB,mBAAmB,IAAI,cAAc,CAiIpD"}
+{"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../src/harness/cursor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAsBH,OAAO,KAAK,EACV,cAAc,EAMf,MAAM,SAAS,CAAC;AAgwBjB,wBAAgB,mBAAmB,IAAI,cAAc,CAgIpD"}