abtars 0.2.2 → 0.2.3-alpha.0

package/bundle/{chunk-Y2XBDQP3.js → chunk-SEXVA3GK.js}

@@ -1286,6 +1286,7 @@ function buildSessionStartPrompt(prompt, memory, userId, sessionKey, maxContext,
       const type = typeMap[sessionType] ?? sessionType;
       const index = parseInt(parts[2], 10);
       contextParts.push(`[SESSION] #${index} (${type})`);
+      logInfo(TAG3, `Injected session identity: #${index} (${type})`);
     }
   }
   const isCodeSession = sessionType === "C";
@@ -1329,7 +1330,12 @@ You are now talking to ${user.userId} (${user.role}, ${CLASS_NAMES[user.maxClass
   if (platform2) {
     const CAPS = { telegram: "voice, reactions, typing, TTS, groups", discord: "reactions, typing, threads", irc: "text only" };
     contextParts.push(`[SYSTEM] Platform: ${platform2} (${CAPS[platform2] ?? "unknown"})`);
+    logInfo(TAG3, `Injected platform: ${platform2}`);
   }
+  const transportType = getEnv().defaultTransport === "acp" ? "ACP" : "Direct API";
+  const runtimeLine = `[SYSTEM] Runtime: abtars bridge (${transportType}). All registered bridge tools are available.`;
+  contextParts.push(runtimeLine);
+  logInfo(TAG3, `Injected runtime identity: ${transportType}`);
   const compSummary = null;
   if (compSummary && sessionKey) {
   } else {
@@ -1359,7 +1365,10 @@ You are now talking to ${user.userId} (${user.role}, ${CLASS_NAMES[user.maxClass
         }
         if (sessionKey && !sessionKey.includes("_C_")) {
           const status = abmind().buildStatusBlock(memory);
-          if (status) contextParts.push(status);
+          if (status) {
+            contextParts.push(status);
+            logInfo(TAG3, `Injected system status (${status.length} chars)`);
+          }
         }
       }
     } catch (err) {
@@ -1373,6 +1382,8 @@ ${contextParts.join("\n\n")}
 ` : "";
   const result = contextBlock + prompt;
   logTrace(TAG3, `session-start assembled: ${contextParts.length} parts, context=${contextBlock.length} chars, prompt=${prompt.length} chars, total=${result.length} chars`);
+  logTrace(TAG3, `session-start injections:
+${contextParts.filter((p) => p.startsWith("[")).map((p) => "  " + p.slice(0, 120)).join("\n")}`);
   if (result.length < 5e3) {
     logInfo(TAG3, `Session-start prompt suspiciously small (${result.length} chars) \u2014 SOUL may be missing`);
   }
@@ -1949,7 +1960,32 @@ var TAG5 = "cmd_registry";
 var exactCommands = {};
 var prefixCommands = [];
 var KNOWN_COMMANDS = /* @__PURE__ */ new Set();
-var NON_MASTER_COMMANDS = /* @__PURE__ */ new Set(["/new", "/reset", "/stop", "/ctrlc", "/status", "/help", "/whoami"]);
+var NON_MASTER_COMMANDS = /* @__PURE__ */ new Set([
+  "/status",
+  "/help",
+  "/whoami",
+  "/doctor",
+  "/software",
+  "/update",
+  "/models",
+  "/model",
+  "/skills",
+  "/skill",
+  "/facts",
+  "/tasks",
+  "/task",
+  "/usage",
+  "/openrouter",
+  "/session",
+  "/hooks",
+  "/memory",
+  "/kanban",
+  "/heartbeat",
+  "/new",
+  "/reset",
+  "/stop",
+  "/ctrlc"
+]);
 function registerExact(name, handler) {
   exactCommands[name] = handler;
   KNOWN_COMMANDS.add(name);
@@ -1983,6 +2019,11 @@ async function handleCommand(text, ctx) {
   if (text.startsWith("/") && /^\/\w+/.test(text) && !text.startsWith("//")) {
     const cmd = text.split(/\s/)[0];
     if (!KNOWN_COMMANDS.has(cmd)) {
+      const match = fuzzyMatch(cmd);
+      if (match) {
+        const corrected = text.replace(cmd, match);
+        return handleCommand(corrected, ctx);
+      }
       await ctx.reply(`\u2753 Unknown command: ${cmd}
 Type /help for available commands.`);
       return true;
@@ -2046,6 +2087,32 @@ function killWakeInhibit() {
 function setWakeInhibitPid(pid) {
   _wakeInhibitPid = pid;
 }
+function levenshtein(a, b) {
+  const m = a.length, n = b.length;
+  const d = Array.from({ length: n + 1 }, (_, i) => i);
+  for (let i = 1; i <= m; i++) {
+    let prev = i - 1;
+    d[0] = i;
+    for (let j = 1; j <= n; j++) {
+      const tmp = d[j];
+      d[j] = a[i - 1] === b[j - 1] ? prev : 1 + Math.min(prev, d[j], d[j - 1]);
+      prev = tmp;
+    }
+  }
+  return d[n];
+}
+function fuzzyMatch(cmd) {
+  let best = null;
+  let bestDist = 3;
+  for (const known of KNOWN_COMMANDS) {
+    const dist = levenshtein(cmd, known);
+    if (dist < bestDist) {
+      best = known;
+      bestDist = dist;
+    }
+  }
+  return best;
+}
 
 // src/components/commands/handlers-transport.ts
 init_logger();
@@ -2389,6 +2456,16 @@ async function handleReasoning(text, ctx) {
   }
   return true;
 }
+async function handleContinue(_text, ctx) {
+  const response = await ctx.transport.sendPrompt(
+    ctx.sessionKey,
+    "[SYSTEM] Something went wrong during your previous response. Continue from where you left off.",
+    void 0,
+    ctx.userId
+  );
+  if (response) await ctx.reply(response);
+  return true;
+}
 
 // src/components/commands/exec-async.ts
 import { execFile } from "node:child_process";
@@ -2422,7 +2499,7 @@ ${raw || "(no output)"}`);
     }
     return true;
   }
-  const { getDoctorReport, renderDoctorText } = await import("./doctor-PIPSGI3H.js");
+  const { getDoctorReport, renderDoctorText } = await import("./doctor-WHTVSUOF.js");
   const force = arg === "force";
   const svcStates = ctx.registry?.getStates() ?? {};
   await ctx.reply("\u{1FA7A} Running diagnostics...");
@@ -2431,6 +2508,7 @@ ${raw || "(no output)"}`);
     transport: ctx.transport,
     telegramRunning: svcStates.telegram?.running ?? false,
     discordRunning: svcStates.discord?.running ?? false,
+    ircRunning: svcStates.irc?.running ?? false,
     phaseHealth: ctx.phaseHealth
   }, { force });
   await ctx.reply(renderDoctorText(report));
@@ -2438,7 +2516,7 @@ ${raw || "(no output)"}`);
 }
 async function handleStatus(_text, ctx) {
   if (ctx.phaseHealth && ctx.registry) {
-    const { getSystemStatus, renderStatusText } = await import("./system-status-7K2QTH3J.js");
+    const { getSystemStatus, renderStatusText } = await import("./system-status-KMKPAC5Z.js");
     const status = await getSystemStatus({
       phaseHealth: ctx.phaseHealth,
       registry: ctx.registry,
@@ -2477,6 +2555,12 @@ async function handleStop(_text, ctx) {
   return true;
 }
 async function handleRestart(_text, ctx) {
+  const arg = _text.replace(/^\/restart\s*/i, "").trim().toLowerCase();
+  if (arg === "cold") {
+    await ctx.reply("\u{1F9CA} Cold restart (process exit \u2192 supervisor respawn)...");
+    setTimeout(() => process.exit(0), 500);
+    return true;
+  }
   await ctx.reply("\u267B\uFE0F Restarting bridge...");
   setTimeout(() => ctx.requestShutdown?.(0), 500);
   return true;
@@ -2785,41 +2869,37 @@ async function handleSoftware(_text, ctx) {
       }
       try {
         const { spawnSync } = await import("node:child_process");
-        const { mkdirSync: mkdirSync2 } = await import("node:fs");
+        const { mkdirSync: mkdirSync2, rmSync: rms } = await import("node:fs");
         const srcDir = join2(home, "src", "abtars");
         const abmindDir = join2(home, "src", "abmind");
         logInfo("update", "Pull requested");
-        if (!existsSync(join2(srcDir, ".git"))) {
-          await ctx.reply("Cloning abtars repo...");
+        const pullOrReclone = (dir, repo) => {
           mkdirSync2(join2(home, "src"), { recursive: true });
-          const cl = spawnSync("git", ["clone", "git@github.com:aksika/abtars.git", srcDir], { encoding: "utf-8", timeout: 6e4 });
-          if (cl.status !== 0) {
-            logInfo("update", "Clone failed");
-            await ctx.reply(`Clone failed:
-${(cl.stderr || "").trim().slice(0, 300)}`);
-            return true;
+          if (existsSync(join2(dir, ".git"))) {
+            spawnSync("git", ["-C", dir, "fetch", "origin", "dev"], { encoding: "utf-8", timeout: 3e4 });
+            const r = spawnSync("git", ["-C", dir, "reset", "--hard", "origin/dev"], { encoding: "utf-8" });
+            const hasConflicts = spawnSync("git", ["-C", dir, "grep", "-q", "^<<<<<<<"], { encoding: "utf-8" }).status === 0;
+            if (r.status === 0 && !hasConflicts) {
+              return { ok: true, msg: (r.stdout || "").trim().slice(0, 300) };
+            }
+            logInfo("update", `${dir}: reset failed or conflicts \u2014 recloning`);
+            rms(dir, { recursive: true, force: true });
           }
-        }
-        spawnSync("git", ["-C", srcDir, "fetch", "origin", "dev"], { encoding: "utf-8", timeout: 3e4 });
-        const r = spawnSync("git", ["-C", srcDir, "reset", "--hard", "origin/dev"], { encoding: "utf-8" });
-        if (r.status !== 0) {
+          const cl = spawnSync("git", ["clone", "-b", "dev", repo, dir], { encoding: "utf-8", timeout: 6e4 });
+          if (cl.status === 0) return { ok: true, msg: "cloned fresh" };
+          return { ok: false, msg: (cl.stderr || "").trim().slice(0, 300) };
+        };
+        const abtarsResult = pullOrReclone(srcDir, "git@github.com:aksika/abtars.git");
+        if (!abtarsResult.ok) {
           await ctx.reply(`Pull failed (abtars):
-${(r.stderr || "").trim().slice(0, 300)}`);
+${abtarsResult.msg}`);
           return true;
         }
         let pulled = `Pulled:
-${(r.stdout || "").trim().slice(0, 300)}`;
-        if (existsSync(join2(abmindDir, ".git"))) {
-          spawnSync("git", ["-C", abmindDir, "fetch", "origin", "dev"], { encoding: "utf-8", timeout: 3e4 });
-          const ab = spawnSync("git", ["-C", abmindDir, "reset", "--hard", "origin/dev"], { encoding: "utf-8" });
-          if (ab.status !== 0) {
-            await ctx.reply(`Pull failed (abmind):
-${(ab.stderr || "").trim().slice(0, 300)}`);
-            return true;
-          }
-          pulled += `
-abmind: ${(ab.stdout || "").trim().slice(0, 200)}`;
-        }
+${abtarsResult.msg}`;
+        const abmindResult = pullOrReclone(abmindDir, "git@github.com:aksika/abmind.git");
+        pulled += `
+abmind: ${abmindResult.msg}`;
         logInfo("update", `Pull complete`);
         await ctx.reply(`${pulled}
 
@@ -2849,7 +2929,18 @@ Ready to deploy: /update deploy`);
           return true;
         }
         logInfo("update", `Deploy starting (non-blocking)`);
+        const markers = spawnSync("git", ["-C", srcDir, "grep", "-l", "^<<<<<<<"], { encoding: "utf-8", timeout: 1e4 });
+        if (markers.stdout.trim()) {
+          const files = markers.stdout.trim().split("\n").join(", ");
+          await ctx.reply(`\u26A0\uFE0F Conflict markers found in source \u2014 refusing to deploy.
+Files: ${files}
+Repo has a broken commit. Notify dev team.`);
+          return true;
+        }
         await ctx.reply("\u2699\uFE0F Deploying (building in background)...");
+        const logFile = `deploy-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "").slice(0, 15)}.log`;
+        const { writeFileSync: wfs } = await import("node:fs");
+        wfs(join2(home, "deploy.state"), JSON.stringify({ status: "running", startedAt: (/* @__PURE__ */ new Date()).toISOString(), logFile }) + "\n");
         const script = join2(srcDir, "scripts", "build-and-deploy.sh");
         spawn2("bash", [script, srcDir, abmindDir], {
           detached: true,
@@ -2859,7 +2950,7 @@ Ready to deploy: /update deploy`);
         await ctx.reply(`Deploy failed: ${err instanceof Error ? err.message : String(err)}`);
       }
       return true;
-    } else if (arg === "update" || arg === "npm" || arg === "update npm") {
+    } else if (arg === "npm" || arg === "update npm") {
       if (!isMaster) {
         await ctx.reply("Requires master role.");
         return true;
@@ -2960,6 +3051,23 @@ Ready to deploy: /update deploy`);
       lines.push(`    ${i}: (empty)`);
     }
   }
+  try {
+    const stateRaw = readFileSync(join2(home, "deploy.state"), "utf-8");
+    const ds = JSON.parse(stateRaw);
+    if (ds.status === "running") {
+      const ago = Math.round((Date.now() - new Date(ds.startedAt).getTime()) / 6e4);
+      lines.push(`
+  \u{1F504} Deploy in progress (${ago}min ago)`);
+    } else if (ds.status === "failed") {
+      lines.push(`
+  \u274C Last deploy failed: ${ds.error}
+     Log: ~/.abtars/logs/${ds.logFile}`);
+    } else if (ds.status === "partial") {
+      lines.push(`
+  \u26A0\uFE0F Last deploy incomplete: missing ${ds.missing?.join(", ")}`);
+    }
+  } catch {
+  }
   lines.push("");
   lines.push("  /update [pull|deploy|npm] | /software rollback <version>");
   await ctx.reply(lines.join("\n"));
@@ -3420,9 +3528,10 @@ async function handleKanban(text, ctx) {
       return true;
     }
     const lines = cards.map((c) => {
-      const icon = c.status === "delivered" ? "\u2705" : c.status === "done" ? "\u{1F4EC}" : c.status === "running" ? "\u23F3" : c.status === "failed" ? "\u274C" : "\u{1F4E5}";
+      const icon = c.status === "delivered" ? "\u2713" : c.status === "done" ? "+" : c.status === "running" ? "~" : c.status === "failed" ? "\u2717" : "-";
       const due = c.due_at ? ` due:${c.due_at.slice(0, 10)}` : "";
-      return `${icon} #${c.id} ${c.title} (${c.source}/${c.priority})${due}`;
+      const doneAt = c.delivered_at ? ` ${c.delivered_at.slice(2, 10).replace(/-/g, "")}:${c.delivered_at.slice(11, 16).replace(":", "")}` : "";
+      return `${icon} #${c.id} ${c.title} (${c.source}/${c.priority})${doneAt}${due}`;
     });
     await ctx.reply(`\u{1F4CB} Kanban Board (${cards.length}):
 ${lines.join("\n")}`);
@@ -3996,7 +4105,6 @@ registerExact("/update", handleSoftware);
 registerExact("/facts", handleFacts);
 registerExact("/tasks", handleTasksList);
 registerExact("/task", handleTasksList);
-registerExact("/cron", handleTasksList);
 registerExact("/kanban", handleKanban);
 registerPrefix("/kanban ", handleKanban);
 registerExact("/memory", handleMemory);
@@ -4005,6 +4113,7 @@ registerExact("/models", handleModels);
 registerExact("/model", handleModels);
 registerExact("/change", (_, ctx) => handleModels("/model change", ctx));
 registerExact("/reasoning", handleReasoning);
+registerExact("/continue", handleContinue);
 registerExact("/emergency", handleEmergencyAlias);
 registerExact("/help", handleHelp);
 registerExact("/users", handleUsers);
@@ -4021,10 +4130,8 @@ registerExact("/session", handleSession);
 registerPrefix("/session ", handleSession);
 registerPrefix("/tasks run ", handleTasksTrigger);
 registerPrefix("/task run ", handleTasksTrigger);
-registerPrefix("/cron run ", handleTasksTrigger);
 registerPrefix("/tasks log ", handleTasksLog);
 registerPrefix("/task log ", handleTasksLog);
-registerPrefix("/cron log ", handleTasksLog);
 registerPrefix("/nlm", handleNlm);
 registerPrefix("/sleep ", handleSleepSub);
 registerPrefix("/usage ", handleUsage);
@@ -4052,4 +4159,4 @@ export {
   handleInboundMessage,
   startSession
 };
-//# sourceMappingURL=chunk-Y2XBDQP3.js.map
+//# sourceMappingURL=chunk-SEXVA3GK.js.map