@bohuyeshan/openagent-labforge-core 3.13.1 → 3.13.3

package/dist/index.js

@@ -61837,6 +61837,9 @@ function isAbortError(error48) {
   return false;
 }
 
+// src/hooks/atlas/idle-event.ts
+init_logger();
+
 // src/hooks/atlas/boulder-continuation-injector.ts
 init_logger();
 
@@ -62143,10 +62146,196 @@ async function getLastAgentFromSession(sessionID, client) {
   return getLastAgentFromMessageDir(messageDir);
 }
 
-// src/hooks/atlas/event-handler.ts
+// src/hooks/atlas/resolve-active-boulder-session.ts
+async function resolveActiveBoulderSession(input) {
+  const boulderState = readBoulderState(input.directory);
+  if (!boulderState) {
+    return null;
+  }
+  const progress = getPlanProgress(boulderState.active_plan);
+  if (progress.isComplete) {
+    return { boulderState, progress, appendedSession: false };
+  }
+  if (boulderState.session_ids.includes(input.sessionID)) {
+    return { boulderState, progress, appendedSession: false };
+  }
+  if (!subagentSessions.has(input.sessionID)) {
+    return null;
+  }
+  const updatedBoulderState = appendSessionId(input.directory, input.sessionID);
+  if (!updatedBoulderState?.session_ids.includes(input.sessionID)) {
+    return null;
+  }
+  return {
+    boulderState: updatedBoulderState,
+    progress,
+    appendedSession: true
+  };
+}
+
+// src/hooks/atlas/idle-event.ts
 var CONTINUATION_COOLDOWN_MS2 = 5000;
 var FAILURE_BACKOFF_MS = 5 * 60 * 1000;
 var RETRY_DELAY_MS = CONTINUATION_COOLDOWN_MS2 + 1000;
+function hasRunningBackgroundTasks(sessionID, options) {
+  const backgroundManager = options?.backgroundManager;
+  return backgroundManager ? backgroundManager.getTasksByParentSession(sessionID).some((task) => task.status === "running") : false;
+}
+async function injectContinuation2(input) {
+  const remaining = input.progress.total - input.progress.completed;
+  input.sessionState.lastContinuationInjectedAt = Date.now();
+  try {
+    await injectBoulderContinuation({
+      ctx: input.ctx,
+      sessionID: input.sessionID,
+      planName: input.planName,
+      remaining,
+      total: input.progress.total,
+      agent: input.agent,
+      worktreePath: input.worktreePath,
+      backgroundManager: input.options?.backgroundManager,
+      sessionState: input.sessionState
+    });
+  } catch (error48) {
+    log(`[${HOOK_NAME7}] Failed to inject boulder continuation`, { sessionID: input.sessionID, error: error48 });
+    input.sessionState.promptFailureCount += 1;
+  }
+}
+function scheduleRetry(input) {
+  const { ctx, sessionID, sessionState, options } = input;
+  if (sessionState.pendingRetryTimer) {
+    return;
+  }
+  sessionState.pendingRetryTimer = setTimeout(async () => {
+    sessionState.pendingRetryTimer = undefined;
+    if (sessionState.promptFailureCount >= 2)
+      return;
+    const currentBoulder = await resolveActiveBoulderSession({
+      client: ctx.client,
+      directory: ctx.directory,
+      sessionID
+    });
+    if (!currentBoulder)
+      return;
+    if (currentBoulder.progress.isComplete)
+      return;
+    if (options?.isContinuationStopped?.(sessionID))
+      return;
+    if (hasRunningBackgroundTasks(sessionID, options))
+      return;
+    await injectContinuation2({
+      ctx,
+      sessionID,
+      sessionState,
+      options,
+      planName: currentBoulder.boulderState.plan_name,
+      progress: currentBoulder.progress,
+      agent: currentBoulder.boulderState.agent,
+      worktreePath: currentBoulder.boulderState.worktree_path
+    });
+  }, RETRY_DELAY_MS);
+}
+async function handleAtlasSessionIdle(input) {
+  const { ctx, options, getState, sessionID } = input;
+  log(`[${HOOK_NAME7}] session.idle`, { sessionID });
+  const activeBoulderSession = await resolveActiveBoulderSession({
+    client: ctx.client,
+    directory: ctx.directory,
+    sessionID
+  });
+  if (!activeBoulderSession) {
+    log(`[${HOOK_NAME7}] Skipped: not boulder or background task session`, { sessionID });
+    return;
+  }
+  const { boulderState, progress } = activeBoulderSession;
+  if (progress.isComplete) {
+    log(`[${HOOK_NAME7}] Boulder complete`, { sessionID, plan: boulderState.plan_name });
+    return;
+  }
+  const sessionState = getState(sessionID);
+  const now = Date.now();
+  if (sessionState.lastEventWasAbortError) {
+    sessionState.lastEventWasAbortError = false;
+    log(`[${HOOK_NAME7}] Skipped: abort error immediately before idle`, { sessionID });
+    return;
+  }
+  if (sessionState.promptFailureCount >= 2) {
+    const timeSinceLastFailure = sessionState.lastFailureAt !== undefined ? now - sessionState.lastFailureAt : Number.POSITIVE_INFINITY;
+    if (timeSinceLastFailure < FAILURE_BACKOFF_MS) {
+      log(`[${HOOK_NAME7}] Skipped: continuation in backoff after repeated failures`, {
+        sessionID,
+        promptFailureCount: sessionState.promptFailureCount,
+        backoffRemaining: FAILURE_BACKOFF_MS - timeSinceLastFailure
+      });
+      return;
+    }
+    sessionState.promptFailureCount = 0;
+    sessionState.lastFailureAt = undefined;
+  }
+  if (hasRunningBackgroundTasks(sessionID, options)) {
+    log(`[${HOOK_NAME7}] Skipped: background tasks running`, { sessionID });
+    return;
+  }
+  if (options?.isContinuationStopped?.(sessionID)) {
+    log(`[${HOOK_NAME7}] Skipped: continuation stopped for session`, { sessionID });
+    return;
+  }
+  const sessionAgent = getSessionAgent(sessionID);
+  const lastAgent = await getLastAgentFromSession(sessionID, ctx.client);
+  const effectiveAgent = sessionAgent ?? lastAgent;
+  const lastAgentKey = getAgentConfigKey(effectiveAgent ?? "");
+  const configuredBoulderAgent = boulderState.agent;
+  const requiredAgentName = configuredBoulderAgent ?? (isAgentRegistered("atlas") ? "atlas" : undefined);
+  if (!requiredAgentName) {
+    log(`[${HOOK_NAME7}] Skipped: boulder agent is unavailable for continuation`, {
+      sessionID,
+      requiredAgent: requiredAgentName ?? "unknown"
+    });
+    return;
+  }
+  if (!configuredBoulderAgent && !isAgentRegistered(requiredAgentName)) {
+    log(`[${HOOK_NAME7}] Skipped: implicit boulder agent is unavailable for continuation`, {
+      sessionID,
+      requiredAgent: requiredAgentName
+    });
+    return;
+  }
+  const requiredAgent = getAgentConfigKey(requiredAgentName);
+  const lastAgentMatchesRequired = lastAgentKey === requiredAgent;
+  const boulderAgentDefaultsToAtlas = requiredAgent === "atlas";
+  const lastAgentIsSisyphus = lastAgentKey === "sisyphus";
+  const allowSisyphusForAtlasBoulder = boulderAgentDefaultsToAtlas && lastAgentIsSisyphus;
+  const agentMatches = lastAgentMatchesRequired || allowSisyphusForAtlasBoulder;
+  if (!agentMatches) {
+    log(`[${HOOK_NAME7}] Skipped: last agent does not match boulder agent`, {
+      sessionID,
+      lastAgent: effectiveAgent ?? "unknown",
+      requiredAgent
+    });
+    return;
+  }
+  if (sessionState.lastContinuationInjectedAt && now - sessionState.lastContinuationInjectedAt < CONTINUATION_COOLDOWN_MS2) {
+    scheduleRetry({ ctx, sessionID, sessionState, options });
+    log(`[${HOOK_NAME7}] Skipped: continuation cooldown active`, {
+      sessionID,
+      cooldownRemaining: CONTINUATION_COOLDOWN_MS2 - (now - sessionState.lastContinuationInjectedAt),
+      pendingRetry: !!sessionState.pendingRetryTimer
+    });
+    return;
+  }
+  await injectContinuation2({
+    ctx,
+    sessionID,
+    sessionState,
+    options,
+    planName: boulderState.plan_name,
+    progress,
+    agent: boulderState.agent,
+    worktreePath: boulderState.worktree_path
+  });
+}
+
+// src/hooks/atlas/event-handler.ts
 function createAtlasEventHandler(input) {
   const { ctx, options, sessions, getState } = input;
   return async ({ event }) => {
@@ -62165,143 +62354,7 @@ function createAtlasEventHandler(input) {
       const sessionID = props?.sessionID;
       if (!sessionID)
         return;
-      log(`[${HOOK_NAME7}] session.idle`, { sessionID });
-      const boulderState = readBoulderState(ctx.directory);
-      const isBoulderSession = boulderState?.session_ids?.includes(sessionID) ?? false;
-      const isBackgroundTaskSession = subagentSessions.has(sessionID);
-      if (!isBackgroundTaskSession && !isBoulderSession) {
-        log(`[${HOOK_NAME7}] Skipped: not boulder or background task session`, { sessionID });
-        return;
-      }
-      const state3 = getState(sessionID);
-      const now = Date.now();
-      if (state3.lastEventWasAbortError) {
-        state3.lastEventWasAbortError = false;
-        log(`[${HOOK_NAME7}] Skipped: abort error immediately before idle`, { sessionID });
-        return;
-      }
-      if (state3.promptFailureCount >= 2) {
-        const timeSinceLastFailure = state3.lastFailureAt !== undefined ? now - state3.lastFailureAt : Number.POSITIVE_INFINITY;
-        if (timeSinceLastFailure < FAILURE_BACKOFF_MS) {
-          log(`[${HOOK_NAME7}] Skipped: continuation in backoff after repeated failures`, {
-            sessionID,
-            promptFailureCount: state3.promptFailureCount,
-            backoffRemaining: FAILURE_BACKOFF_MS - timeSinceLastFailure
-          });
-          return;
-        }
-        state3.promptFailureCount = 0;
-        state3.lastFailureAt = undefined;
-      }
-      const backgroundManager = options?.backgroundManager;
-      const hasRunningBgTasks = backgroundManager ? backgroundManager.getTasksByParentSession(sessionID).some((t) => t.status === "running") : false;
-      if (hasRunningBgTasks) {
-        log(`[${HOOK_NAME7}] Skipped: background tasks running`, { sessionID });
-        return;
-      }
-      if (!boulderState) {
-        log(`[${HOOK_NAME7}] No active boulder`, { sessionID });
-        return;
-      }
-      if (options?.isContinuationStopped?.(sessionID)) {
-        log(`[${HOOK_NAME7}] Skipped: continuation stopped for session`, { sessionID });
-        return;
-      }
-      const sessionAgent = getSessionAgent(sessionID);
-      const lastAgent = await getLastAgentFromSession(sessionID, ctx.client);
-      const effectiveAgent = sessionAgent ?? lastAgent;
-      const lastAgentKey = getAgentConfigKey(effectiveAgent ?? "");
-      const requiredAgentName = boulderState.agent ?? (isAgentRegistered("atlas") ? "atlas" : undefined);
-      if (!requiredAgentName || !isAgentRegistered(requiredAgentName)) {
-        log(`[${HOOK_NAME7}] Skipped: boulder agent is unavailable for continuation`, {
-          sessionID,
-          requiredAgent: requiredAgentName ?? "unknown"
-        });
-        return;
-      }
-      const requiredAgent = getAgentConfigKey(requiredAgentName);
-      const lastAgentMatchesRequired = lastAgentKey === requiredAgent;
-      const boulderAgentDefaultsToAtlas = requiredAgent === "atlas";
-      const lastAgentIsSisyphus = lastAgentKey === "sisyphus";
-      const allowSisyphusForAtlasBoulder = boulderAgentDefaultsToAtlas && lastAgentIsSisyphus;
-      const agentMatches = lastAgentMatchesRequired || allowSisyphusForAtlasBoulder;
-      if (!agentMatches) {
-        log(`[${HOOK_NAME7}] Skipped: last agent does not match boulder agent`, {
-          sessionID,
-          lastAgent: effectiveAgent ?? "unknown",
-          requiredAgent
-        });
-        return;
-      }
-      const progress = getPlanProgress(boulderState.active_plan);
-      if (progress.isComplete) {
-        log(`[${HOOK_NAME7}] Boulder complete`, { sessionID, plan: boulderState.plan_name });
-        return;
-      }
-      if (state3.lastContinuationInjectedAt && now - state3.lastContinuationInjectedAt < CONTINUATION_COOLDOWN_MS2) {
-        if (!state3.pendingRetryTimer) {
-          state3.pendingRetryTimer = setTimeout(async () => {
-            state3.pendingRetryTimer = undefined;
-            if (state3.promptFailureCount >= 2)
-              return;
-            const currentBoulder = readBoulderState(ctx.directory);
-            if (!currentBoulder)
-              return;
-            if (!currentBoulder.session_ids?.includes(sessionID))
-              return;
-            const currentProgress = getPlanProgress(currentBoulder.active_plan);
-            if (currentProgress.isComplete)
-              return;
-            if (options?.isContinuationStopped?.(sessionID))
-              return;
-            const hasBgTasks = backgroundManager ? backgroundManager.getTasksByParentSession(sessionID).some((t) => t.status === "running") : false;
-            if (hasBgTasks)
-              return;
-            state3.lastContinuationInjectedAt = Date.now();
-            const currentRemaining = currentProgress.total - currentProgress.completed;
-            try {
-              await injectBoulderContinuation({
-                ctx,
-                sessionID,
-                planName: currentBoulder.plan_name,
-                remaining: currentRemaining,
-                total: currentProgress.total,
-                agent: currentBoulder.agent,
-                worktreePath: currentBoulder.worktree_path,
-                backgroundManager,
-                sessionState: state3
-              });
-            } catch (err) {
-              log(`[${HOOK_NAME7}] Delayed retry failed`, { sessionID, error: err });
-              state3.promptFailureCount++;
-            }
-          }, RETRY_DELAY_MS);
-        }
-        log(`[${HOOK_NAME7}] Skipped: continuation cooldown active`, {
-          sessionID,
-          cooldownRemaining: CONTINUATION_COOLDOWN_MS2 - (now - state3.lastContinuationInjectedAt),
-          pendingRetry: !!state3.pendingRetryTimer
-        });
-        return;
-      }
-      state3.lastContinuationInjectedAt = now;
-      const remaining = progress.total - progress.completed;
-      try {
-        await injectBoulderContinuation({
-          ctx,
-          sessionID,
-          planName: boulderState.plan_name,
-          remaining,
-          total: progress.total,
-          agent: boulderState.agent,
-          worktreePath: boulderState.worktree_path,
-          backgroundManager,
-          sessionState: state3
-        });
-      } catch (err) {
-        log(`[${HOOK_NAME7}] Failed to inject boulder continuation`, { sessionID, error: err });
-        state3.promptFailureCount++;
-      }
+      await handleAtlasSessionIdle({ ctx, options, getState, sessionID });
       return;
     }
     if (event.type === "message.updated") {
@@ -96096,7 +96149,8 @@ async function applyAgentConfig(params) {
   const isSisyphusEnabled = params.pluginConfig.sisyphus_agent?.disabled !== true;
   const builderEnabled = params.pluginConfig.sisyphus_agent?.default_builder_enabled ?? false;
   const plannerEnabled = params.pluginConfig.sisyphus_agent?.planner_enabled ?? true;
-  const replacePlan = params.pluginConfig.sisyphus_agent?.replace_plan ?? true;
+  const replacePlan = params.pluginConfig.sisyphus_agent?.replace_plan ?? false;
+  const hijackBuild = params.pluginConfig.sisyphus_agent?.hijack_build ?? false;
   const shouldDemotePlan = plannerEnabled && replacePlan;
   const configuredDefaultAgent = getConfiguredDefaultAgent(params.config);
   if (isSisyphusEnabled && builtinAgents.sisyphus) {
@@ -96129,7 +96183,7 @@ async function applyAgentConfig(params) {
       });
     }
     const filteredConfigAgents = configAgent ? Object.fromEntries(Object.entries(configAgent).filter(([key]) => {
-      if (key === "build")
+      if (key === "build" && hijackBuild)
         return false;
       if (key === "plan" && shouldDemotePlan)
         return false;
@@ -96156,7 +96210,7 @@ async function applyAgentConfig(params) {
       ...filterDisabledAgents(filteredProjectAgents),
       ...filterDisabledAgents(filteredPluginAgents),
       ...filteredConfigAgents,
-      build: { ...migratedBuild, mode: "subagent", hidden: true },
+      ...hijackBuild ? { build: { ...migratedBuild, mode: "subagent", hidden: true } } : {},
       ...planDemoteConfig ? { plan: planDemoteConfig } : {}
     };
   } else {

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@bohuyeshan/openagent-labforge-core",
-  "version": "3.13.1",
+  "version": "3.13.3",
   "description": "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "type": "module",
-  "bin": {
-    "openagent-labforge": "bin/openagent-labforge.js"
-  },
-  "oc-plugin": [
-    "server",
-    "tui"
-  ],
+  "bin": {
+    "openagent-labforge": "bin/openagent-labforge.js"
+  },
+  "oc-plugin": [
+    "server",
+    "tui"
+  ],
   "files": [
     "dist",
     "bin",
@@ -50,14 +50,14 @@
   ],
   "author": "YeonGyu-Kim",
   "license": "SUL-1.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/BOHUYESHAN-APB/openagent-labforge.git"
-  },
-  "bugs": {
-    "url": "https://github.com/BOHUYESHAN-APB/openagent-labforge/issues"
-  },
-  "homepage": "https://github.com/BOHUYESHAN-APB/openagent-labforge#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/BOHUYESHAN-APB/openagent-labforge.git"
+  },
+  "bugs": {
+    "url": "https://github.com/BOHUYESHAN-APB/openagent-labforge/issues"
+  },
+  "homepage": "https://github.com/BOHUYESHAN-APB/openagent-labforge#readme",
   "dependencies": {
     "@ast-grep/cli": "^0.40.0",
     "@ast-grep/napi": "^0.40.0",
@@ -83,18 +83,18 @@
     "typescript": "^5.7.3"
   },
   "optionalDependencies": {
-    "openagent-labforge-darwin-arm64": "3.11.2",
-    "openagent-labforge-darwin-x64": "3.11.2",
-    "openagent-labforge-darwin-x64-baseline": "3.11.2",
-    "openagent-labforge-linux-arm64": "3.11.2",
-    "openagent-labforge-linux-arm64-musl": "3.11.2",
-    "openagent-labforge-linux-x64": "3.11.2",
-    "openagent-labforge-linux-x64-baseline": "3.11.2",
-    "openagent-labforge-linux-x64-musl": "3.11.2",
-    "openagent-labforge-linux-x64-musl-baseline": "3.11.2",
-    "openagent-labforge-windows-x64": "3.13.1",
-    "openagent-labforge-windows-x64-baseline": "3.11.2"
-  },
+    "openagent-labforge-darwin-arm64": "3.11.2",
+    "openagent-labforge-darwin-x64": "3.11.2",
+    "openagent-labforge-darwin-x64-baseline": "3.11.2",
+    "openagent-labforge-linux-arm64": "3.11.2",
+    "openagent-labforge-linux-arm64-musl": "3.11.2",
+    "openagent-labforge-linux-x64": "3.11.2",
+    "openagent-labforge-linux-x64-baseline": "3.11.2",
+    "openagent-labforge-linux-x64-musl": "3.11.2",
+    "openagent-labforge-linux-x64-musl-baseline": "3.11.2",
+    "openagent-labforge-windows-x64": "3.13.3",
+    "openagent-labforge-windows-x64-baseline": "3.11.2"
+  },
   "overrides": {
     "@opencode-ai/sdk": "^1.2.17"
   },