arisa 5.1.66 → 5.1.68

package/README.md

@@ -183,7 +183,7 @@ Authorized Telegram chats can run the same safe service lifecycle with `/restart
 
 Background mode runs the Telegram/Pi worker under a lightweight supervisor. Unexpected worker exits use bounded exponential restart backoff. Scheduled agent tasks are serialized FIFO per conversation while different conversations remain independent; execution deadlines default to 15 minutes for scheduled prompts and 5 minutes for agent events. A timed-out turn is marked outcome-uncertain and is never replayed automatically. These policies can be overridden with `service.workerRestart*` and `tasks.*TimeoutMs` in the Arisa config.
 
-Tools may declare weighted execution resources in their manifest, for example `"execution": { "resourceClass": "browser", "weight": 1 }`. Runs sharing a declared class queue fairly once they reach its capacity; undeclared lightweight tools remain unconstrained. The default capacity is two per declared class. Override it with `toolExecution.defaultCapacity`, `toolExecution.capacities`, and `toolExecution.maxQueuedPerClass`. Arisa logs queue waits and new worker RSS peaks for operational measurement.
+Tools may declare weighted execution resources in their manifest, for example `"execution": { "resourceClass": "browser", "weight": 1 }`. Runs sharing a declared class queue fairly once they reach its capacity; undeclared lightweight tools remain unconstrained. The default capacity is two per declared class, while the built-in `orchestrator` class has capacity one. An opt-in tool may set `deduplicateConcurrent: true` to join only exact concurrent duplicates from the same chat; later or different requests still execute normally. Override capacities with `toolExecution.defaultCapacity`, `toolExecution.capacities`, and `toolExecution.maxQueuedPerClass`. Arisa logs queue waits, joined duplicates, and new worker RSS peaks for operational measurement.
 
 Runtime model override (current process only):
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arisa",
-  "version": "5.1.66",
+  "version": "5.1.68",
   "description": "Telegram + Pi Agent modular assistant",
   "type": "module",
   "main": "src/index.js",

package/src/core/config/config-defaults.js

@@ -19,7 +19,7 @@ export const daemonConfigDefaults = Object.freeze({
 export const toolExecutionConfigDefaults = Object.freeze({
   defaultCapacity: 2,
   maxQueuedPerClass: 100,
-  capacities: Object.freeze({})
+  capacities: Object.freeze({ orchestrator: 1 })
 });
 
 export const telegramConfigDefaults = Object.freeze({

package/src/core/tools/daemon-health.js

@@ -97,7 +97,7 @@ async function tryInternalRecovery(record, paths, policy) {
 async function scheduleRestart(record, paths, status, policy, reason) {
   const current = await readJson(paths.statusFile, status);
   const restartAttempts = Number(current.restartAttempts || 0) + 1;
-  if (restartAttempts > policy.restartLimit) {
+  if (restartAttempts > policy.restartLimit && !record.autoStart) {
     await stopManagedDaemon(
       { toolName: record.toolName, scope: record.scope },
       { state: null }
@@ -115,6 +115,9 @@ async function scheduleRestart(record, paths, status, policy, reason) {
     return "failed";
   }
 
+  const retainedAttempts = record.autoStart && restartAttempts > policy.restartLimit
+    ? policy.restartLimit
+    : restartAttempts;
   const delayMs = retryDelay(restartAttempts, policy);
   await stopManagedDaemon(
     { toolName: record.toolName, scope: record.scope },
@@ -124,7 +127,7 @@ async function scheduleRestart(record, paths, status, policy, reason) {
     state: "restarting",
     pid: null,
     heartbeatAt: null,
-    restartAttempts,
+    restartAttempts: retainedAttempts,
     restartRequested: true,
     nextRestartAt: new Date(Date.now() + delayMs).toISOString(),
     lastError: errorRecord("restart", reason),

package/src/core/tools/tool-registry.js

@@ -1,7 +1,7 @@
 import { mkdir, readdir, readFile, rmdir, unlink, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { spawn } from "node:child_process";
-import { randomUUID } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { arisaIpcSocketFile, arisaPackageDir, getToolConfigPath, getToolStateDir, getToolTmpDir, getChatToolTmpDir, toolsDir as userToolsRoot } from "../../runtime/paths.js";
 import { loadToolConfig, parseConfigModule, writeToolConfig } from "./tool-config.js";
 import { normalizeToolResult } from "./tool-result.js";
@@ -25,6 +25,19 @@ function positiveDuration(value, fallback) {
   return Number.isFinite(value) && value > 0 ? value : fallback;
 }
 
+function canonicalRequestValue(value) {
+  if (Array.isArray(value)) return value.map(canonicalRequestValue);
+  if (value && typeof value === "object") {
+    return Object.fromEntries(Object.keys(value).sort().map((key) => [key, canonicalRequestValue(value[key])]));
+  }
+  return value === undefined ? null : value;
+}
+
+function concurrentExecutionKey(name, chatId, request) {
+  const serialized = JSON.stringify(canonicalRequestValue({ name, chatId: chatId == null ? null : String(chatId), request }));
+  return createHash("sha256").update(serialized).digest("hex");
+}
+
 function waitForToolProcess(child, { timeoutMs, killGraceMs, label }) {
   return new Promise((resolve, reject) => {
     let timedOut = false;
@@ -289,6 +302,7 @@ export class ToolRegistry {
       policy: executionPolicy,
       logger
     });
+    this.concurrentExecutions = new Map();
   }
 
   async buildSnapshot() {
@@ -476,7 +490,25 @@ export class ToolRegistry {
       .sort((left, right) => left.name.localeCompare(right.name));
   }
 
-  async run({ name, request, chatId = null, onEvent = null }) {
+  async run(invocation) {
+    const tool = this.get(invocation.name);
+    if (!tool?.execution?.deduplicateConcurrent) return this.runOnce(invocation);
+    const key = concurrentExecutionKey(invocation.name, invocation.chatId, invocation.request);
+    const active = this.concurrentExecutions.get(key);
+    if (active) {
+      this.logger?.log("tools", `joined concurrent duplicate ${invocation.name}`);
+      return active;
+    }
+    const execution = this.runOnce(invocation);
+    this.concurrentExecutions.set(key, execution);
+    try {
+      return await execution;
+    } finally {
+      if (this.concurrentExecutions.get(key) === execution) this.concurrentExecutions.delete(key);
+    }
+  }
+
+  async runOnce({ name, request, chatId = null, onEvent = null }) {
     const tool = this.get(name);
     if (!tool) throw new Error(`Tool not found: ${name}`);
     const dependencyIssue = this.dependencyIssues(name)[0];

package/src/core/tools/weighted-resource-governor.js

@@ -24,7 +24,11 @@ export function normalizeToolExecution(execution) {
   if (!resourceClass) throw new Error("Tool execution resourceClass is required");
   const weight = positiveInteger(execution.weight, 0);
   if (!weight) throw new Error("Tool execution weight must be a positive integer");
-  return { resourceClass, weight };
+  return {
+    resourceClass,
+    weight,
+    deduplicateConcurrent: execution.deduplicateConcurrent === true
+  };
 }
 
 export function normalizeToolExecutionPolicy(policy = {}) {

package/src/official-tools.lock.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "repository": "https://github.com/clasen/Arisa.git",
-  "commit": "f5702971f09b70c28b239d8c32fa30cb069c0e38",
+  "commit": "c05810a8a719ddcd96b044632334df32554bf804",
   "tools": {
     "browser-session-bridge": {
       "version": "0.1.0",
@@ -31,13 +31,9 @@
       }
     },
     "campaign-draft-runner": {
-      "version": "0.5.0",
-      "toolDependencies": {
-        "pr-campaign": "^0.1.0",
-        "gmail-workspace": "^0.1.0"
-      },
+      "version": "0.5.2",
       "files": {
-        "README.md": "2c977357f774c6bc3369460ba9cd784c9b75b5f12b338e089e634e09f2a8cbcd",
+        "README.md": "c5c91bad056e5ffc5a17624074d766d3489a502dd84e176286a515980f32fb7a",
         "batch-skip.js": "ad428464b739e7355e00ac7cf399247ce611fcef0470d97a73893701e5b07627",
         "config.js": "9b9c2d9686cebf17c3ba2630088c7028281883608f61054e733283aeb8d383cb",
         "index.js": "669bf964a0e1e1a0bacc5997c6e49539022649f405543e5914ba01aa11a99330",
@@ -46,11 +42,11 @@
         "product-facts.js": "69339e20e7b70a6b9833878d72b10b70ea4ede4aa448097975d0961b6aaced59",
         "search-quality.js": "ab5412d45d5144e976cccef52992e634c11aca0e21b73fd53f9dc2d489c56dd7",
         "source-exhaustion.js": "407f940f5205eb01715a797672d0dad8bd0b0b897024b5fcb87052a062ecd054",
-        "telemetry.js": "984772e73d1cbb761771d6f62954a604333a301182ee74368a41ffab762da367",
+        "telemetry.js": "b3ededa1277d5028f7a8299926e16bb4dc06d70c470d3b97352c29080cfc0974",
         "test/batch-skip.test.js": "638d185dc0b38900afe6ee9058e733ae36583d0762a0ff0347fdf245df064abc",
         "test/selection-policy.test.js": "1283f18b861925aee810d156eb64c54b147304ff7352a8f83b9c2311e1f51de2",
-        "test/telemetry.test.js": "daa84b83658226ecd979f15d4e12d94740ffe5280d467ad29677fc1d77734a5b",
-        "tool.manifest.json": "71520f3be858b9c2193223e370c10d938484a2af9281087e6dc14410b45cb2ae"
+        "test/telemetry.test.js": "8e52a43fa9eb08fa0f3be124b72b7cd39258666cb88311b1df6978037372c257",
+        "tool.manifest.json": "cb5eff1b5fd85d97c704e0287f1527c9763b320cacac22093e3aceeba4f7f256"
       }
     },
     "creator-scout": {
@@ -103,14 +99,14 @@
       }
     },
     "master-slave": {
-      "version": "0.1.2",
+      "version": "0.1.7",
       "files": {
         "README.md": "9755dd59d01680236d12b57f87e4bc52568649a0e63b1a96065baf800d8dc1c8",
         "batch-runner.js": "97756a03b36278cd0315cc16da0c34a7821c322149c51ba6666f1c5081dbecbc",
         "chat-state-store.js": "50de39aa33432733bb688eb01968e314a32b169324a66d0f0089b2a19ed9c880",
-        "command-arguments.js": "ef00f814dee6105e1cd3b8929e974bc071117f162b17e3dcc3dc0ea68e8b1e92",
+        "command-arguments.js": "a67b81b95dadb06fd99a1692e2b52984a02cef5b4cfde59d7863e64c747f5d5e",
         "config.js": "ff1c1cb6701ae1da7a6eb1519ba96a416e48daa73c2155a6f93cf5d64f65cef8",
-        "index.js": "404db150dee0ecf79cd64bca245c618fa1e2bb324d6bc15f5ac0022b72497c63",
+        "index.js": "d00dfd7669cbb24d85bf32ee11ab21c805329182d0bba9068912c75bca58961a",
         "lib/bootstrap-url.js": "f05925cc0f0dff0882f94f9908c6f2c80aa8632cd51f63389381dcbb0f73afb3",
         "lib/encrypted-frames.js": "47e1b11fafdbbcdfd86a0993a47a774e4f37d6386edeaf8ec1c8511b109728cf",
         "lib/handshake-crypto.js": "9728b117aad7de53f5f0e255c0fd865ee1a19633368730a7634334d374094578",
@@ -120,22 +116,22 @@
         "lib/secure-store.js": "b8f365197f8e60d7f81fde6ed1cfc8851b603f6b0783e4cdc9036bb5c99726e1",
         "master-domain.js": "10b7dfb43eb9939eb5baec54f742076cc73a2add6589a0ff57c51bc79c236faf",
         "network-session.js": "db2d81a7ef47af29236d963b98e21414a11fef68e8b20895126eaad3f696ba3d",
-        "package.json": "1f37665b860b7f2f5b37cc931dcc9c4ac4fb82d1260fc14c0646fa4d92ade0b3",
-        "remote-runtime.js": "55dd7e577a822be17c2f337798a2d7f44ad0c5b6d68c46490e058282135c4658",
-        "slave-operations.js": "fec2e8addfff98f080284f24f722c1516124e5f6d12d8c03bb3c9cc0c475d1d6",
+        "package.json": "1f14897232b405300927a7494bd18900bdd7b2eeddea0ceaeb88707c8cb26a01",
+        "remote-runtime.js": "87c53c012b1f9d032af4028b8f92d2c8a84b9730e39e32f3dfcbd60e8d021c20",
+        "slave-operations.js": "5a8967e2006f3f30ee221614d25fbf7863ffd9c717fd7eeeb0ba981c8c8c367a",
         "state-store.js": "c56849a3f1b9c990128276e17963034a7836abacedc44f2e500d5732ebf9e451",
         "test/batch-runner.test.js": "69f69150eadd18c1ad1bc54f429e6cb5bc0c4492e3c6a6e76c2ce6827780ae41",
         "test/bootstrap-url.test.js": "62c112b1a38c59ea2c77f797e32873667b52db32386da661a6ae8410490126fe",
-        "test/command-arguments.test.js": "360c087edd0a589b28111bb82d06e3e73e93a6b22da0a57cb96f0a7e92a9bd5f",
+        "test/command-arguments.test.js": "bc50a1fe3d6474a5daeb7c76a96ba960f4f5e37d8742090b756c152490d8d01c",
         "test/encrypted-frames.test.js": "cfb3195d3a58df7dc570bc7840a21c1841a53e0abc8b92840e0c24ed3435bcc1",
         "test/handshake-crypto.test.js": "f11d6e95658f2055d8256bd7dfb66b39bedf95bf62a3cec5525b109bb6f9bc95",
         "test/master-domain.test.js": "7298766db3e6b186cca0109f352766e1bf417a8af12a58dd1c2b78fd1a61ff24",
         "test/network-session.test.js": "2e459346cc9364be705bc5f54691245044588b2cd03ae77e2e870dee6dfbcca6",
         "test/pairing-secret-store.test.js": "c51257365fd0b641c24768d710cdff2d1c5f8816bf90f66c2c01a226904cb43f",
         "test/profile-catalog.test.js": "d8e297bee413d53ec13f2e1779c13f2e019cb8304976d567eab0e9f1ca36637c",
-        "test/remote-runtime.test.js": "1161bd653dc47b9b8219bf848d0d395ce390f2bb7b58ea41e3e4270b1d504798",
-        "test/slave-operations.test.js": "a84526ad7554c7d03192a68655b4637bec18750559a5c3436f7471e912ca74cc",
-        "tool.manifest.json": "b0b4caee5e818cebc537eadaed852a511f4f65c562b5cd5709cc77edbe33ee15"
+        "test/remote-runtime.test.js": "887705a9c15d979353b3db922f471b67d9607c2c6e0e8c7cebd83618a83597df",
+        "test/slave-operations.test.js": "c826be39bee62ec1b85645324971347cbe6a71e72e383619bc2c7a74f7c0f55b",
+        "tool.manifest.json": "26ae9907720e1893454b3bd3a6dda44207d7cc180459665088037c5d605530aa"
       }
     },
     "mcp-client": {

package/src/runtime/slave-cli.js

@@ -148,6 +148,7 @@ export function formatSlaveStatus({ systemd, diagnostic }) {
     `Endpoint: ${diagnostic?.endpoint || "not configured"}`,
     `Identity: ${diagnostic?.identityFingerprint || diagnostic?.identity || "not configured"}`,
     `Paired: ${diagnostic?.paired === true ? "yes" : diagnostic?.paired === false ? "no" : "unknown"}`,
+    `Connected: ${diagnostic?.network?.connected === true ? "yes" : diagnostic?.network?.connected === false ? "no" : "unknown"}`,
     `Tools: ${Number.isSafeInteger(diagnostic?.toolCount) ? diagnostic.toolCount : "unknown"}`,
     `Jobs: active=${jobs.active ?? "unknown"}, queued=${jobs.queued ?? "unknown"}, failed=${jobs.failed ?? "unknown"}`,
     `Pending secrets: ${Number.isSafeInteger(diagnostic?.pendingSecrets) ? diagnostic.pendingSecrets : "unknown"}`

package/test/daemon-runtime.test.js

@@ -278,6 +278,25 @@ test("describes an intentionally stopped on-demand daemon without treating it as
   assert.equal(diagnostic.lastError, null);
 });
 
+test("keeps auto-start ingress daemons in bounded backoff after the burst retry limit", async () => {
+  const runtime = runtimeFor({ type: "global" }, { autoStart: true });
+  await writeDaemonStatus(runtime.paths, {
+    state: "starting",
+    pid: null,
+    message: "Network unavailable during boot",
+    restartAttempts: policy.restartLimit,
+    restartRequested: false,
+    lastError: { phase: "health", message: "connect ENETUNREACH" }
+  });
+
+  assert.equal(await superviseDaemon(runtime.registration, policy), "restart-scheduled");
+  const status = await readJson(runtime.paths.statusFile, {});
+  assert.equal(status.state, "restarting");
+  assert.equal(status.restartAttempts, policy.restartLimit);
+  assert.equal(status.restartRequested, true);
+  assert.ok(Date.parse(status.nextRestartAt) > Date.now());
+});
+
 test("keeps a terminal daemon failure stable until it receives explicit attention", async () => {
   const runtime = runtimeFor({ type: "global" }, { autoStart: true });
   await writeDaemonStatus(runtime.paths, {
@@ -286,6 +305,7 @@ test("keeps a terminal daemon failure stable until it receives explicit attentio
     message: "Daemon restart limit reached: synthetic crash",
     restartAttempts: policy.restartLimit + 1,
     restartRequested: false,
+    nextRestartAt: null,
     lastError: { phase: "restart", message: "synthetic crash token=private-value", code: "SYNTHETIC" }
   });
 

package/test/model-selection.test.js

@@ -302,7 +302,7 @@ test("centralizes Telegram and Pi defaults in config", () => {
   assert.equal(config.telegram.busyMessageMode, "steer");
   assert.equal(config.toolExecution.defaultCapacity, toolExecutionConfigDefaults.defaultCapacity);
   assert.equal(config.toolExecution.maxQueuedPerClass, 100);
-  assert.deepEqual(config.toolExecution.capacities, {});
+  assert.deepEqual(config.toolExecution.capacities, { orchestrator: 1 });
   assert.equal(config.pi.thinkingLevel, piConfigDefaults.thinkingLevel);
   assert.equal(config.pi.speed, piConfigDefaults.speed);
 });

package/test/slave-cli.test.js

@@ -6,7 +6,7 @@ import test from "node:test";
 import { createHeadlessApp } from "../src/runtime/create-headless-app.js";
 import { parseSlaveBootstrapUrl } from "../src/runtime/slave-bootstrap-url.js";
 import { withSecureRequestFile } from "../src/runtime/secure-request-file.js";
-import { ensureMasterSlaveTool, runSlaveBootstrap, runSlaveCli } from "../src/runtime/slave-cli.js";
+import { ensureMasterSlaveTool, formatSlaveStatus, runSlaveBootstrap, runSlaveCli } from "../src/runtime/slave-cli.js";
 import {
   buildSlaveSystemdUnit,
   getSlavePaths,
@@ -104,6 +104,25 @@ test("escapes systemd WorkingDirectory paths without quoting the entire value",
   assert.match(unit, /^StandardOutput=append:\/srv\/arisa\\x20slave\/state\/arisa-slave\.log$/m);
 });
 
+test("reports Master connectivity separately from pairing and daemon readiness", () => {
+  const text = formatSlaveStatus({
+    systemd: { running: true, status: "active" },
+    diagnostic: {
+      daemon: { state: "ready" },
+      role: "slave",
+      endpoint: "tcp://198.51.100.12:4719",
+      paired: true,
+      network: { connected: false },
+      toolCount: 1,
+      jobs: { active: 0, queued: 0, failed: 0 },
+      pendingSecrets: 0
+    }
+  });
+  assert.match(text, /Daemon: ready/);
+  assert.match(text, /Paired: yes/);
+  assert.match(text, /Connected: no/);
+});
+
 test("refuses to replace the PID of an active Slave host", async (t) => {
   const home = await mkdtemp(path.join(os.tmpdir(), "arisa-slave-pid-"));
   t.after(() => rm(home, { recursive: true, force: true }));

package/test/tool-registry-run.test.js

@@ -1,5 +1,5 @@
 import assert from "node:assert/strict";
-import { access, mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
+import { access, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import test from "node:test";
@@ -171,7 +171,8 @@ test("loads weighted execution metadata from the tool manifest", async () => {
 
   assert.deepEqual(registry.get("heavy-tool").execution, {
     resourceClass: "browser",
-    weight: 2
+    weight: 2,
+    deduplicateConcurrent: false
   });
 });
 
@@ -229,11 +230,49 @@ test("wraps declared tool runs in the shared execution governor", async () => {
 
   assert.equal(result.ok, true);
   assert.deepEqual(calls, [
-    { type: "acquire", execution: { resourceClass: "browser", weight: 1 }, label: "heavy-tool" },
+    {
+      type: "acquire",
+      execution: { resourceClass: "browser", weight: 1, deduplicateConcurrent: false },
+      label: "heavy-tool"
+    },
     { type: "release", label: "heavy-tool" }
   ]);
 });
 
+test("joins exact concurrent duplicates only for tools that opt in", async () => {
+  await resetHome();
+  const dir = await createFakeTool("single-flight-tool", {
+    execution: { resourceClass: "orchestrator", weight: 1, deduplicateConcurrent: true }
+  });
+  await writeFile(path.join(dir, "index.js"), `import { appendFile, readFile } from "node:fs/promises";
+const requestFile = process.argv[process.argv.indexOf("--request-file") + 1];
+const request = JSON.parse(await readFile(requestFile, "utf8"));
+await appendFile(request.args.counterFile, "x");
+await new Promise((resolve) => setTimeout(resolve, 100));
+process.stdout.write(JSON.stringify({ ok: true, output: { text: request.args.value } }));
+`, "utf8");
+  const counterFile = path.join(homeDir, "single-flight-count.txt");
+  const registry = new ToolRegistry({ executionPolicy: { capacities: { orchestrator: 1 } } });
+  await registry.load();
+  const invocation = {
+    name: "single-flight-tool",
+    chatId: "123",
+    request: { args: { counterFile, value: "same" } }
+  };
+
+  const [first, second] = await Promise.all([registry.run(invocation), registry.run(invocation)]);
+
+  assert.deepEqual(second, first);
+  assert.equal(await readFile(counterFile, "utf8"), "x");
+  await Promise.all([
+    registry.run({ ...invocation, request: { args: { counterFile, value: "cross-chat" } } }),
+    registry.run({ ...invocation, chatId: "456", request: { args: { counterFile, value: "cross-chat" } } })
+  ]);
+  assert.equal(await readFile(counterFile, "utf8"), "xxx");
+  await registry.run({ ...invocation, request: { args: { counterFile, value: "different" } } });
+  assert.equal(await readFile(counterFile, "utf8"), "xxxx");
+});
+
 test("runs a registered tool process with an enriched request and cleans up request files", async () => {
   await resetHome();
   await createFakeTool("fake-tool");

package/test/weighted-resource-governor.test.js

@@ -15,8 +15,14 @@ function deferred() {
 test("normalizes manifest weights and configurable class capacities", () => {
   assert.deepEqual(normalizeToolExecution({ resourceClass: "browser", weight: 2 }), {
     resourceClass: "browser",
-    weight: 2
+    weight: 2,
+    deduplicateConcurrent: false
   });
+  assert.equal(normalizeToolExecution({
+    resourceClass: "orchestrator",
+    weight: 1,
+    deduplicateConcurrent: true
+  }).deduplicateConcurrent, true);
   assert.equal(normalizeToolExecution(undefined), null);
   assert.throws(() => normalizeToolExecution({ resourceClass: "Browser!", weight: 1 }), /Invalid tool execution resource class/);
   assert.throws(() => normalizeToolExecution({ resourceClass: "browser", weight: 0 }), /positive integer/);