@mestreyoda/fabrica 0.2.0 → 0.2.2

package/dist/index.js

@@ -111324,8 +111324,8 @@ import fsSync from "node:fs";
 import path5 from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function getCurrentVersion() {
-  if ("0.2.0") {
-    return "0.2.0";
+  if ("0.2.2") {
+    return "0.2.2";
   }
   try {
     const pkgPath = path5.join(THIS_DIR, "..", "..", "package.json");
@@ -112302,7 +112302,7 @@ function resolve2(config2, sourceLayers, trace2) {
     dispatchMs: config2.timeouts?.dispatchMs ?? 6e5,
     staleWorkerHours: config2.timeouts?.staleWorkerHours ?? 2,
     sessionContextBudget: config2.timeouts?.sessionContextBudget ?? 0.6,
-    stallTimeoutMinutes: config2.timeouts?.stallTimeoutMinutes ?? 15,
+    stallTimeoutMinutes: config2.timeouts?.stallTimeoutMinutes ?? 5,
     sessionConfirmAttempts: config2.timeouts?.sessionConfirmAttempts ?? 5,
     sessionConfirmDelayMs: config2.timeouts?.sessionConfirmDelayMs ?? 250,
     sessionLabelMaxLength: config2.timeouts?.sessionLabelMaxLength ?? 64,
@@ -124578,97 +124578,6 @@ function createProjectRegisterTool(ctx) {
 import { jsonResult as jsonResult15 } from "openclaw/plugin-sdk";
 init_audit();
 
-// lib/services/heartbeat/diagnostic.ts
-async function diagnoseStall(input) {
-  const { owner, repo, issueId, dispatchAttemptCount } = input;
-  if ((dispatchAttemptCount ?? 0) >= 2) {
-    const hasArtifacts = await checkForArtifacts(owner, repo, issueId);
-    if (!hasArtifacts) {
-      return { action: "needs_human_review", reason: "stall", evidence: `${dispatchAttemptCount} attempts, zero artifacts` };
-    }
-  }
-  const pr = await findPrForIssue(owner, repo, issueId);
-  if (pr) {
-    const qaStatus = await checkPrQaStatus(owner, repo, pr.number);
-    if (qaStatus === "pass") {
-      return { action: "transition_to_review", reason: "stall", evidence: `PR #${pr.number} exists, QA passing` };
-    }
-    return { action: "redispatch_same_level", reason: "stall", evidence: `PR #${pr.number} exists, QA ${qaStatus}` };
-  }
-  const hasCommits = await checkForBranchCommits(owner, repo, issueId);
-  if (hasCommits) {
-    return { action: "nudge_open_pr", reason: "stall", evidence: "Branch has commits but no PR" };
-  }
-  const sessionAge = Date.now() - input.sessionUpdatedAt;
-  const isSessionDead = sessionAge > 30 * 6e4;
-  if (isSessionDead) {
-    return { action: "log_infra", reason: "infra", evidence: "Session dead, zero artifacts" };
-  }
-  return { action: "escalate_level", reason: "complexity", evidence: "Active session without commits" };
-}
-async function findPrForIssue(owner, repo, issueId) {
-  try {
-    const { execa } = await import("execa");
-    const { stdout } = await execa("gh", [
-      "pr",
-      "list",
-      "--repo",
-      `${owner}/${repo}`,
-      "--search",
-      `${issueId}`,
-      "--json",
-      "number",
-      "--limit",
-      "1"
-    ]);
-    const prs = JSON.parse(stdout);
-    return prs.length > 0 ? prs[0] : null;
-  } catch {
-    return null;
-  }
-}
-async function checkPrQaStatus(owner, repo, prNumber) {
-  try {
-    const { execa } = await import("execa");
-    const { stdout } = await execa("gh", [
-      "pr",
-      "checks",
-      String(prNumber),
-      "--repo",
-      `${owner}/${repo}`,
-      "--json",
-      "state"
-    ]);
-    const checks = JSON.parse(stdout);
-    if (checks.every((c) => c.state === "SUCCESS")) return "pass";
-    if (checks.some((c) => c.state === "FAILURE")) return "fail";
-    return "pending";
-  } catch {
-    return "pending";
-  }
-}
-async function checkForBranchCommits(owner, repo, issueId) {
-  try {
-    const { execa } = await import("execa");
-    const { stdout } = await execa("gh", [
-      "api",
-      `repos/${owner}/${repo}/commits`,
-      "--jq",
-      ".[0].sha",
-      "-f",
-      `sha=issue-${issueId}`
-    ]);
-    return stdout.trim().length > 0;
-  } catch {
-    return false;
-  }
-}
-async function checkForArtifacts(owner, repo, issueId) {
-  const pr = await findPrForIssue(owner, repo, issueId);
-  if (pr) return true;
-  return checkForBranchCommits(owner, repo, issueId);
-}
-
 // lib/services/heartbeat/health.ts
 init_audit();
 init_workflow();
@@ -124676,8 +124585,6 @@ init_context3();
 init_labels();
 var GRACE_PERIOD_MS = 5 * 60 * 1e3;
 var DISPATCH_CONFIRMATION_TIMEOUT_MS = 2 * 60 * 1e3;
-var NUDGE_MESSAGE = `You appear to have stalled. Continue working on your current task. If you are blocked or unable to proceed, call work_finish with result "blocked".`;
-var MAX_STALL_NUDGES = 3;
 async function auditHealthFixApplied(workspaceDir, fix, details) {
   if (!fix.fixed) return;
   await withCorrelationContext({
@@ -124709,8 +124616,7 @@ async function auditHealthFixApplied(workspaceDir, fix, details) {
       toLabel: details.toLabel ?? fix.issue.expectedLabel ?? null,
       idleMinutes: details.idleMinutes ?? null,
       deliveryState: details.deliveryState ?? null,
-      labelReverted: fix.labelReverted ?? null,
-      nudgeSent: fix.nudgeSent ?? false
+      labelReverted: fix.labelReverted ?? null
     }).catch(() => {
     });
   }));
@@ -125043,155 +124949,6 @@ async function checkWorkerHealth(opts) {
         fixes.push(fix);
         continue;
       }
-      if (slot.active && sessionKey && sessions && !withinGracePeriod && isSessionAlive(sessionKey, sessions)) {
-        const session = sessions.get(sessionKey);
-        const stallThresholdMs = (opts.stallTimeoutMinutes ?? 15) * 6e4;
-        if (session.updatedAt == null) continue;
-        const sessionIdleMs = Date.now() - session.updatedAt;
-        if (sessionIdleMs > stallThresholdMs) {
-          const idleMinutes = Math.round(sessionIdleMs / 6e4);
-          const modelUnresponsiveMs = stallThresholdMs * MAX_STALL_NUDGES;
-          const slotAgeMs = slot.startTime ? Date.now() - new Date(slot.startTime).getTime() : sessionIdleMs;
-          if (slotAgeMs > modelUnresponsiveMs) {
-            const diagnostic = await diagnoseStall({
-              projectSlug,
-              owner: project.remote?.owner ?? "",
-              repo: project.remote?.repo ?? "",
-              issueId: issueIdNum ?? 0,
-              sessionKey,
-              slotStartTime: slot.startTime ? new Date(slot.startTime).getTime() : Date.now() - sessionIdleMs,
-              sessionUpdatedAt: session.updatedAt,
-              dispatchAttemptCount: issueRuntime?.dispatchAttemptCount ?? 0
-            });
-            if (issueIdNum) {
-              await updateIssueRuntime(workspaceDir, projectSlug, String(issueIdNum), {
-                lastDiagnosticResult: diagnostic.evidence,
-                lastFailureReason: diagnostic.reason,
-                dispatchAttemptCount: (issueRuntime?.dispatchAttemptCount ?? 0) + 1
-              }).catch(() => {
-              });
-            }
-            const diagnosticType = `diagnostic_${diagnostic.action}`;
-            const fix2 = {
-              issue: {
-                type: diagnosticType,
-                severity: diagnostic.action === "needs_human_review" ? "critical" : "warning",
-                project: project.name,
-                projectSlug,
-                role,
-                level,
-                sessionKey,
-                issueId: slot.issueId,
-                slotIndex,
-                message: `${role.toUpperCase()} ${level}[${slotIndex}] stall diagnosed: ${diagnostic.action} \u2014 ${diagnostic.evidence}`
-              },
-              fixed: false
-            };
-            if (autoFix) {
-              switch (diagnostic.action) {
-                case "transition_to_review":
-                  await revertLabel(fix2, expectedLabel, "To Review");
-                  if (!fix2.labelRevertFailed) {
-                    await deactivateSlot();
-                    fix2.fixed = true;
-                  }
-                  break;
-                case "redispatch_same_level":
-                case "nudge_open_pr":
-                case "retry_infra":
-                  await revertLabel(fix2, expectedLabel, slotQueueLabel);
-                  if (!fix2.labelRevertFailed) {
-                    await deactivateSlot();
-                    fix2.fixed = true;
-                  }
-                  break;
-                case "escalate_level":
-                  await revertLabel(fix2, expectedLabel, slotQueueLabel);
-                  if (!fix2.labelRevertFailed) {
-                    await deactivateSlot();
-                    fix2.fixed = true;
-                  }
-                  break;
-                case "needs_human_review":
-                  await deactivateSlot();
-                  fix2.fixed = true;
-                  break;
-                case "log_infra":
-                  await deactivateSlot();
-                  fix2.fixed = true;
-                  break;
-              }
-            }
-            await log(workspaceDir, "stall_diagnostic", {
-              project: project.name,
-              projectSlug,
-              role,
-              level,
-              sessionKey,
-              issueId: slot.issueId,
-              slotIndex,
-              idleMinutes,
-              diagnostic: diagnostic.action,
-              reason: diagnostic.reason,
-              evidence: diagnostic.evidence,
-              dispatchAttemptCount: (issueRuntime?.dispatchAttemptCount ?? 0) + 1
-            }).catch(() => {
-            });
-            fixes.push(fix2);
-            continue;
-          }
-          const fix = {
-            issue: {
-              type: "session_stalled",
-              severity: "critical",
-              project: project.name,
-              projectSlug,
-              role,
-              level,
-              sessionKey,
-              issueId: slot.issueId,
-              slotIndex,
-              message: `${role.toUpperCase()} ${level}[${slotIndex}] session idle ${idleMinutes}m \u2014 sending nudge`
-            },
-            fixed: false
-          };
-          if (autoFix) {
-            sendToAgent(sessionKey, NUDGE_MESSAGE, {
-              agentId: opts.agentId,
-              projectName: project.name,
-              issueId: issueIdNum,
-              role,
-              level,
-              slotIndex,
-              workspaceDir,
-              runCommand: opts.runCommand,
-              runtime: opts.runtime
-            });
-            fix.nudgeSent = true;
-            fix.fixed = true;
-            await auditHealthFixApplied(workspaceDir, fix, {
-              action: "nudge_session",
-              idleMinutes,
-              deliveryState
-            });
-          }
-          await log(workspaceDir, "session_stalled", {
-            project: project.name,
-            projectSlug,
-            role,
-            level,
-            sessionKey,
-            issueId: slot.issueId,
-            slotIndex,
-            idleMinutes,
-            deliveryState,
-            action: "nudge"
-          }).catch(() => {
-          });
-          fixes.push(fix);
-          continue;
-        }
-      }
       if (slot.active && slot.startTime && sessionKey && sessions && isSessionAlive(sessionKey, sessions)) {
         const hours = (Date.now() - new Date(slot.startTime).getTime()) / 36e5;
         if (hours > staleWorkerHours) {
@@ -125225,6 +124982,32 @@ async function checkWorkerHealth(opts) {
           fixes.push(fix);
         }
       }
+      if (slot.active && issueIdNum && issue2 && currentLabel === expectedLabel && autoFix) {
+        try {
+          const prStatus = await provider.getPrStatus(issueIdNum);
+          if (prStatus.url && prStatus.state !== PrState.MERGED && prStatus.state !== PrState.CLOSED && prStatus.state !== PrState.CHANGES_REQUESTED && prStatus.state !== PrState.HAS_COMMENTS && prStatus.currentIssueMatch !== false) {
+            const rule = getCompletionRule(workflow, role, "done");
+            if (rule && rule.to !== expectedLabel) {
+              await resilientLabelTransition(provider, issueIdNum, expectedLabel, rule.to);
+              await deactivateSlot();
+              await log(workspaceDir, "health_transition_to_review", {
+                project: project.name,
+                projectSlug,
+                role,
+                level,
+                issueId: slot.issueId,
+                sessionKey,
+                slotIndex,
+                fromLabel: expectedLabel,
+                toLabel: rule.to,
+                prUrl: prStatus.url
+              }).catch(() => {
+              });
+            }
+          }
+        } catch {
+        }
+      }
       if (!slot.active && issue2 && currentLabel === expectedLabel) {
         const fix = {
           issue: {
@@ -125504,8 +125287,7 @@ function createHealthTool(ctx) {
             role,
             sessions,
             autoFix: fix,
-            provider,
-            runCommand: ctx.runCommand
+            provider
           });
           issues.push(...healthFixes.map((f3) => ({ ...f3, project: project.name, role })));
           const orphanFixes = await scanOrphanedLabels({
@@ -131644,10 +131426,6 @@ async function performHealthPass(workspaceDir, projectSlug, project, sessions, p
       autoFix: true,
       provider,
       staleWorkerHours,
-      stallTimeoutMinutes,
-      runCommand,
-      runtime,
-      agentId,
       workflow: resolvedConfig?.workflow,
       dispatchConfirmTimeoutMs: resolvedConfig?.timeouts?.dispatchConfirmTimeoutMs
     });
@@ -138727,16 +138505,32 @@ async function classifyDmIntent(ctx, content, _workspaceDir) {
       idempotencyKey: sessionKey
     });
     const waitResult = await runtime.subagent.waitForRun({ runId, timeoutMs: 15e3 });
-    if (waitResult.status !== "ok") return null;
-    const messages = await runtime.subagent.getSessionMessages({ sessionKey });
-    const lastAssistant = messages?.filter((m2) => m2.role === "assistant").pop();
-    const text = lastAssistant?.content ?? "";
-    if (!text.trim()) return null;
+    if (waitResult.status !== "ok") {
+      ctx.logger.warn(`[telegram-bootstrap] classify waitForRun status=${waitResult.status} (expected ok)`);
+      return null;
+    }
+    const messagesResult = await runtime.subagent.getSessionMessages({ sessionKey });
+    const messages = Array.isArray(messagesResult) ? messagesResult : Array.isArray(messagesResult?.messages) ? messagesResult.messages : [];
+    const lastAssistant = messages.filter((m2) => m2.role === "assistant").pop();
+    if (!lastAssistant) {
+      ctx.logger.warn(`[telegram-bootstrap] classify: no assistant message found (messages=${messages.length}, resultType=${typeof messagesResult})`);
+      return null;
+    }
+    const rawContent = lastAssistant.content;
+    const text = typeof rawContent === "string" ? rawContent : Array.isArray(rawContent) ? rawContent.find((b) => b.type === "text")?.text ?? "" : "";
+    if (!text.trim()) {
+      ctx.logger.warn(`[telegram-bootstrap] classify: empty text from assistant (contentType=${typeof rawContent}, isArray=${Array.isArray(rawContent)})`);
+      return null;
+    }
     const jsonStr = text.replace(/^```(json)?/gm, "").replace(/```$/gm, "").trim();
     const intentData = JSON.parse(jsonStr);
     const validated = DmIntentSchema.safeParse(intentData);
+    if (!validated.success) {
+      ctx.logger.warn(`[telegram-bootstrap] classify: schema validation failed: ${validated.error?.message}`);
+    }
     return validated.success ? validated.data : null;
-  } catch {
+  } catch (err) {
+    ctx.logger.warn(`[telegram-bootstrap] classify exception: ${err.message ?? err}`);
     return null;
   }
 }
@@ -138816,14 +138610,16 @@ function buildTopicDeepLink(chatId, topicId) {
 function buildDmAck(projectName, topicLink, language = "pt") {
   return BOOTSTRAP_MESSAGES.registered[language](projectName, topicLink);
 }
-function buildTopicKickoff(projectName, idea) {
-  return [
-    `\u{1F9F1} Projeto registrado automaticamente pela Fabrica.`,
-    `Projeto: ${projectName}`,
-    "",
-    "Resumo do pedido inicial:",
-    idea
-  ].join("\n");
+function buildTopicKickoff(projectName, idea, language = "pt") {
+  const header = language === "en" ? `\u{1F9F1} Project automatically registered by Fabrica.
+Project: ${projectName}
+
+Original request summary:` : `\u{1F9F1} Projeto registrado automaticamente pela Fabrica.
+Projeto: ${projectName}
+
+Resumo do pedido inicial:`;
+  return `${header}
+${idea}`;
 }
 async function sendTelegramText(ctx, target, message, opts) {
   const sendOpts = {
@@ -139113,7 +138909,8 @@ Erro: ${result.error ?? "erro desconhecido"}`
         accountId: telegramConfig.projectsForumAccountId ?? void 0
       }
     });
-    await sendTelegramText(ctx, projectChannelId, buildTopicKickoff(resolvedProjectName, request.rawIdea), {
+    const sessionLang = currentSession?.language ?? "pt";
+    await sendTelegramText(ctx, projectChannelId, buildTopicKickoff(resolvedProjectName, request.rawIdea, sessionLang), {
       accountId: telegramConfig.projectsForumAccountId,
       messageThreadId
     });
@@ -139132,7 +138929,6 @@ Erro: ${result.error ?? "erro desconhecido"}`
         logBootstrapWarning(ctx, `[telegram-bootstrap] immediate projectTick failed: ${error48 instanceof Error ? error48.message : String(error48)}`);
       });
     }
-    const sessionLang = currentSession?.language ?? "pt";
     await sendTelegramText(ctx, conversationId, buildDmAck(resolvedProjectName, buildTopicDeepLink(String(projectChannelId), messageThreadId), sessionLang));
     await upsertTelegramBootstrapSession(workspaceDir, {
       conversationId,
@@ -139652,6 +139448,36 @@ function registerGatewayLifecycleHook(api, ctx) {
 
 // lib/dispatch/subagent-lifecycle-hook.ts
 init_audit();
+
+// lib/dispatch/reactive-dispatch-hook.ts
+var COMPLETION_TOOLS = /* @__PURE__ */ new Set(["work_finish", "review_submit"]);
+var spawnTimes = /* @__PURE__ */ new Map();
+function getSpawnTime(sessionKey) {
+  return spawnTimes.get(sessionKey);
+}
+function clearSpawnTime(sessionKey) {
+  spawnTimes.delete(sessionKey);
+}
+function registerReactiveDispatchHooks(api, ctx) {
+  api.on("after_tool_call", async (event, _eventCtx) => {
+    if (!COMPLETION_TOOLS.has(event.toolName)) return;
+    ctx.runtime?.system.requestHeartbeatNow({ reason: "work_finish", coalesceMs: 2e3 });
+  });
+  api.on("agent_end", async (_event, eventCtx) => {
+    const sessionKey = eventCtx.sessionKey;
+    if (!sessionKey) return;
+    const parsed = parseFabricaSessionKey(sessionKey);
+    if (!parsed) return;
+    ctx.runtime?.system.requestHeartbeatNow({ reason: "agent_end", coalesceMs: 2e3 });
+  });
+  api.on("subagent_spawned", async (event, _eventCtx) => {
+    const sessionKey = event.childSessionKey;
+    if (!sessionKey) return;
+    spawnTimes.set(sessionKey, Date.now());
+  });
+}
+
+// lib/dispatch/subagent-lifecycle-hook.ts
 function registerSubagentLifecycleHook(api, ctx) {
   const workspaceDir = resolveWorkspaceDir(ctx.config);
   if (!workspaceDir) return;
@@ -139661,11 +139487,15 @@ function registerSubagentLifecycleHook(api, ctx) {
     const parsed = parseFabricaSessionKey(sessionKey);
     if (!parsed) return;
     const { projectName, role } = parsed;
+    const spawnTime = getSpawnTime(sessionKey);
+    clearSpawnTime(sessionKey);
+    const durationMs = spawnTime != null ? Date.now() - spawnTime : void 0;
     await log(workspaceDir, "subagent_ended", {
       sessionKey,
       project: projectName,
       role,
-      outcome: event.outcome ?? "unknown"
+      outcome: event.outcome ?? "unknown",
+      ...durationMs != null ? { durationMs } : {}
     }).catch(() => {
     });
     ctx.logger.info(
@@ -139729,6 +139559,23 @@ function registerModelResolveHook(api, ctx) {
   });
 }
 
+// lib/dispatch/worker-context-hook.ts
+var WORK_FINISH_CONTEXT = `## Task Completion
+
+When you have finished your task, you MUST call the \`work_finish\` tool to signal completion.
+Do NOT rely on your session ending automatically \u2014 you must explicitly call \`work_finish\`.
+This is required for the pipeline to advance to the next stage.
+`;
+function registerWorkerContextHook(api, _ctx) {
+  api.on("before_agent_start", async (_event, eventCtx) => {
+    const sessionKey = eventCtx.sessionKey;
+    if (!sessionKey) return;
+    const parsed = parseFabricaSessionKey(sessionKey);
+    if (!parsed) return;
+    return { prependSystemContext: WORK_FINISH_CONTEXT };
+  });
+}
+
 // index.ts
 var plugin = {
   id: "fabrica",
@@ -139869,8 +139716,10 @@ var plugin = {
     registerGatewayLifecycleHook(api, ctx);
     registerSubagentLifecycleHook(api, ctx);
     registerModelResolveHook(api, ctx);
+    registerWorkerContextHook(api, ctx);
+    registerReactiveDispatchHooks(api, ctx);
     ctx.logger.info(
-      "Fabrica plugin registered (25 tools, 1 CLI command group, 1 service, 7 hooks total: bootstrap, telegram-dm bootstrap, attachment, gateway lifecycle, subagent lifecycle, model-resolve, optional GitHub webhook route)"
+      "Fabrica plugin registered (25 tools, 1 CLI command group, 1 service, 9 hooks total: bootstrap, telegram-dm bootstrap, attachment, gateway lifecycle, subagent lifecycle, model-resolve, worker-context, reactive-dispatch, optional GitHub webhook route)"
     );
   }
 };