@tamsensedev/runner 0.19.0 → 0.20.1

package/dist/cli.js

@@ -906,6 +906,7 @@ function helperStopRequest(stop) {
 var DEFAULT_MODEL = "default";
 var QUIET_MS = 1e3;
 var IDLE_LIMIT_MS = 3e4;
+var BACKGROUND_LIMIT_MS = 6e5;
 function userMessage(text2) {
   return { type: "user", message: { role: "user", content: text2 }, parent_tool_use_id: null };
 }
@@ -926,6 +927,12 @@ function switchLine(change) {
 function isActivity(message) {
   return message.type === "assistant" || message.type === "user" || message.type === "system" && message.subtype === "init";
 }
+function backgroundOf(message) {
+  if (message.type !== "system" || message.subtype !== "background_tasks_changed") {
+    return null;
+  }
+  return message.tasks.filter((task) => !task.ambient).length;
+}
 function inputChannel(options = {}) {
   const queue = [];
   const seen = /* @__PURE__ */ new Set();
@@ -941,6 +948,7 @@ function inputChannel(options = {}) {
   let quiet = false;
   let idleEpoch = 0;
   let inFlight = 0;
+  let background = 0;
   let statesSeen = false;
   let wake = null;
   let timers = [];
@@ -966,7 +974,7 @@ function inputChannel(options = {}) {
     wakeUp();
   }
   function maybeClose() {
-    if (started && idle && drained && quiet && queue.length === 0 && inFlight === 0) {
+    if (started && idle && drained && quiet && background === 0 && queue.length === 0 && inFlight === 0) {
       close();
     }
   }
@@ -974,23 +982,34 @@ function inputChannel(options = {}) {
     idle = false;
     clearTimers();
   }
-  function turnEnded() {
-    if (closed || idle) {
-      return;
-    }
-    idle = true;
-    idleEpoch += 1;
-    drained = !options.onIdle;
+  function armTimers() {
+    clearTimers();
     quiet = false;
-    timers = [
+    timers = background > 0 ? [setTimeout(close, options.backgroundLimitMs ?? BACKGROUND_LIMIT_MS)] : [
       setTimeout(() => {
         quiet = true;
         maybeClose();
       }, options.quietMs ?? QUIET_MS),
       setTimeout(close, options.idleLimitMs ?? IDLE_LIMIT_MS)
     ];
+  }
+  function turnEnded() {
+    if (closed || idle) {
+      return;
+    }
+    idle = true;
+    idleEpoch += 1;
+    drained = !options.onIdle;
+    armTimers();
     options.onIdle?.();
   }
+  function backgroundChanged(count) {
+    const was = background;
+    background = count;
+    if (idle && !closed && was > 0 !== count > 0) {
+      armTimers();
+    }
+  }
   async function* stream(own) {
     for (; ; ) {
       if (closed || own !== generation) {
@@ -1032,6 +1051,11 @@ function inputChannel(options = {}) {
     },
     // Если Claude Code сообщает состояние сессии, верим только ему: idle приходит после фоновых задач
     observe(message) {
+      const tasks = backgroundOf(message);
+      if (tasks !== null) {
+        backgroundChanged(tasks);
+        return;
+      }
       if (message.type === "system" && message.subtype === "session_state_changed") {
         statesSeen = true;
         if (message.state === "idle") {
@@ -3918,7 +3942,7 @@ function describeDevice(identity) {
 }
 
 // src/sense.ts
-import { mkdtemp, rm as rm5 } from "fs/promises";
+import { mkdtemp, rm as rm5, stat as stat2 } from "fs/promises";
 import { tmpdir } from "os";
 import { dirname as dirname4, join as join9 } from "path";
 import process5 from "process";
@@ -3971,7 +3995,8 @@ async function sleep(ms, signal) {
 
 // src/sense.ts
 var SERVER_NAME3 = "tamsense";
-var MAX_SENSE_TURNS = 3;
+var WEB_TOOL = "WebFetch";
+var MAX_SENSE_TURNS = 6;
 var HEARTBEAT_MS = 5e3;
 var STOPPED_HERE = "stopped_here";
 var CLOSED_ON_SITE = "closed_on_site";
@@ -3989,12 +4014,13 @@ function claudeSenseRunner(startQuery) {
       options: {
         cwd: request.cwd,
         systemPrompt: request.system,
-        tools: [],
+        tools: [WEB_TOOL],
         settingSources: [],
         persistSession: false,
+        ...request.resume === null ? {} : { resume: request.resume, forkSession: true },
         strictMcpConfig: true,
         mcpServers: tools.length > 0 ? { [SERVER_NAME3]: createSdkMcpServer3({ name: SERVER_NAME3, version: "1.0.0", tools }) } : {},
-        allowedTools: tools.map((item) => `mcp__${SERVER_NAME3}__${item.name}`),
+        allowedTools: [WEB_TOOL, ...tools.map((item) => `mcp__${SERVER_NAME3}__${item.name}`)],
         permissionMode: "auto",
         canUseTool: denyWhenAsked,
         maxTurns: MAX_SENSE_TURNS,
@@ -4027,8 +4053,17 @@ function senseHeartbeat(api, job, abort) {
     }
   };
 }
+async function authorSession(job, dataFolder) {
+  if (!job.author) {
+    return null;
+  }
+  const folder = taskFolder(dataFolder, { taskId: job.taskId, stage: { columnId: job.author.columnId } });
+  const found = await stat2(folder).catch(() => null);
+  return found?.isDirectory() ? { folder, sessionId: job.author.sessionId } : null;
+}
 async function runSenseJob(job, runSense, tools, stop) {
-  const cwd = await mkdtemp(join9(tmpdir(), "tamsense-sense-"));
+  const scratch = await mkdtemp(join9(tmpdir(), "tamsense-sense-"));
+  const author = await authorSession(job, tools.dataFolder);
   const run2 = new AbortController();
   const stopRun = () => run2.abort(STOPPED_HERE);
   if (stop.aborted) {
@@ -4038,17 +4073,24 @@ async function runSenseJob(job, runSense, tools, stop) {
   const deadline = setTimeout(() => run2.abort(TOO_LONG), job.deadlineMs);
   const beat = senseHeartbeat(tools.api, job, () => run2.abort(CLOSED_ON_SITE));
   const beating = setInterval(() => void beat(), HEARTBEAT_MS);
-  let body;
+  let body = FAILED;
   try {
     const env = withNodeOnPath(process5.env, dirname4(process5.execPath));
-    body = await runSense({ system: job.system, prompt: job.prompt, schema: job.schema, model: job.model, cwd, env, signal: run2.signal, sources: sourceTools(job.tools, tools.api, sensePath(job.senseId, "sources")) });
+    const sources = sourceTools(job.tools, tools.api, sensePath(job.senseId, "sources"));
+    const ask = (cwd, resume) => runSense({ system: job.system, prompt: job.prompt, schema: job.schema, model: job.model, cwd, resume, env, signal: run2.signal, sources }).catch(() => FAILED);
+    if (author) {
+      body = await ask(author.folder, author.sessionId);
+    }
+    if (body.outcome === "failed" && !run2.signal.aborted) {
+      body = await ask(scratch, null);
+    }
   } catch {
     body = FAILED;
   } finally {
     clearTimeout(deadline);
     clearInterval(beating);
     stop.removeEventListener("abort", stopRun);
-    await rm5(cwd, { recursive: true, force: true });
+    await rm5(scratch, { recursive: true, force: true });
   }
   if (run2.signal.reason === CLOSED_ON_SITE) {
     return;
@@ -4218,7 +4260,7 @@ async function prepareLibrary(folder, skills, source = LIBRARY_PATH) {
 // src/recordings.ts
 import { randomUUID } from "crypto";
 import { createReadStream } from "fs";
-import { readdir as readdir2, readFile as readFile4, stat as stat2, writeFile as writeFile4 } from "fs/promises";
+import { readdir as readdir2, readFile as readFile4, stat as stat3, writeFile as writeFile4 } from "fs/promises";
 import { basename as basename4, dirname as dirname5, extname as extname2, isAbsolute as isAbsolute3, join as join11 } from "path";
 import { createInterface as createInterface2 } from "readline";
 import { Readable } from "stream";
@@ -4325,7 +4367,7 @@ async function remember(dir, file) {
   await writeFile4(join11(dir, LEDGER_FILE), JSON.stringify([...done2]));
 }
 async function nonEmpty(file) {
-  return file !== null && ((await stat2(file).catch(() => null))?.size ?? 0) > 0;
+  return file !== null && ((await stat3(file).catch(() => null))?.size ?? 0) > 0;
 }
 async function pendingRecordings(dir) {
   const done2 = await ledger(dir);
@@ -4360,7 +4402,7 @@ async function uploadReplay(upload, file, label) {
 }
 async function uploadVideo(upload, file, label, meta) {
   const contentType = VIDEO_TYPES_BY_EXTENSION[extname2(file).toLowerCase()];
-  const info = await stat2(file);
+  const info = await stat3(file);
   if (info.size > MAX_VIDEO_BYTES) {
     throw new Error(`The video is larger than ${MAX_VIDEO_BYTES / 1024 / 1024} MB. Record a shorter one.`);
   }
@@ -4449,7 +4491,7 @@ async function uploadPendingRecordings(api, runId, dir) {
 }
 
 // src/screenshot.ts
-import { readFile as readFile5, stat as stat3 } from "fs/promises";
+import { readFile as readFile5, stat as stat4 } from "fs/promises";
 import { basename as basename5, extname as extname3, isAbsolute as isAbsolute4 } from "path";
 var TYPES_BY_EXTENSION2 = {
   ".png": "image/png",
@@ -4471,7 +4513,7 @@ async function readScreenshot(request) {
   } catch (error) {
     return error instanceof Error ? error.message : String(error);
   }
-  const info = await stat3(request.path).catch(() => null);
+  const info = await stat4(request.path).catch(() => null);
   if (!info?.isFile()) {
     return `There is no file at ${request.path}.`;
   }