arisa 4.2.2 → 4.2.6

package/README.md

@@ -86,6 +86,7 @@ All runtime state lives under `~/.arisa/`, split between global state and per-ch
 
 Global:
 - runtime config is stored in `~/.arisa/state/config.json`
+- Pi OAuth credentials are stored in `~/.arisa/state/pi-auth.json`
 - the scheduled-task queue is stored in `~/.arisa/state/tasks.json`
 - installed tools live under `~/.arisa/tools/<tool>/`, each with a default `config.js` template
 - global tool runtime state (daemons, caches, temp) lives under `~/.arisa/state/tools/<tool>/`
@@ -134,6 +135,17 @@ Notes:
 
 - it only affects the current Arisa process and does not update `~/.arisa/state/config.json`
 
+## Multiple instances
+
+Set `ARISA_HOME` to run separate Arisa instances on the same machine:
+
+```bash
+ARISA_HOME=~/.arisa-work arisa
+ARISA_HOME=~/.arisa-personal arisa start
+```
+
+Each home has its own Telegram config, Pi login, installed tools, daemons, chat sessions, artifacts, IPC socket, PID file, and logs. Pi OAuth credentials are stored in `<home>/state/pi-auth.json`, so existing installs authenticate once again after upgrading.
+
 ## Bootstrap flow
 
 On first run, Arisa walks you through three steps:
@@ -156,6 +168,7 @@ src/
 ~/.arisa/
   state/              global config, task queue, IPC socket
     config.json
+    pi-auth.json
     tasks.json
     tools/<tool>/     global tool state (daemons, caches, tmp)
   tools/<tool>/       installed tools (catalog, user-chosen, or agent-created)

package/package.json

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

package/src/core/agent/auth-flow.js

@@ -78,11 +78,11 @@ export function buildPiAuthTelegramMessage({ config, issue = null, verified = fa
   if (verified) {
     lines.push("No action needed.");
   } else if (!issue) {
-    lines.push("Run `/auth` to validate these credentials against the provider.");
+    lines.push("Run /auth to validate these credentials against the provider.");
   } else if (status.hasApiKey) {
     lines.push("A Pi API key is configured, but the provider rejected the current request. Update the key and restart Arisa.");
   } else if (status.supportsOAuth) {
-    lines.push("Run `/auth` here in Telegram to renew the Pi login.");
+    lines.push("Run /auth here in Telegram to renew the Pi login.");
   } else {
     lines.push("This provider needs a Pi API key. Re-run `arisa --bootstrap`, provide a key, and restart Arisa.");
   }
@@ -103,7 +103,7 @@ export function buildPiAuthRecoveryBlockedMessage({ config, issue = null, renewa
 
   lines.push(renewalActive
     ? "A Pi login is already in progress. Paste the redirect URL or code here when the provider gives it to you."
-    : "Send `/auth` to start Pi login from Telegram.");
+    : "Send /auth to start Pi login from Telegram.");
 
   return lines.join("\n");
 }

package/src/core/agent/pi-auth-login.js

@@ -1,7 +1,8 @@
 import { AuthStorage } from "@earendil-works/pi-coding-agent";
+import { piAuthFile } from "../../runtime/paths.js";
 
 export function createPiOAuthLogin({ provider, onAuth, onDeviceCode, onPrompt, onProgress, onSelect } = {}) {
-  const authStorage = AuthStorage.create();
+  const authStorage = AuthStorage.create(piAuthFile);
   const oauthProvider = authStorage.getOAuthProviders().find((item) => item.id === provider);
   if (!oauthProvider) {
     throw new Error(`No internal OAuth login flow is available for ${provider}.`);

package/src/core/agent/pi-runtime.js

@@ -1,11 +1,12 @@
 import { AuthStorage, ModelRegistry } from "@earendil-works/pi-coding-agent";
+import { piAuthFile } from "../../runtime/paths.js";
 
 function compareText(a, b) {
   return a.localeCompare(b, undefined, { sensitivity: "base", numeric: true });
 }
 
 export function createPiRuntime({ provider, apiKey } = {}) {
-  const authStorage = AuthStorage.create();
+  const authStorage = AuthStorage.create(piAuthFile);
   if (provider && apiKey) {
     authStorage.setRuntimeApiKey(provider, apiKey);
   }

package/src/runtime/bootstrap.js

@@ -6,6 +6,7 @@ import { spawn } from "node:child_process";
 import { Bot } from "grammy";
 import { createPiOAuthLogin } from "../core/agent/pi-auth-login.js";
 import { createPiRuntime, hasProviderAuth, listPiProviders, listProviderModels, supportsProviderOAuth } from "../core/agent/pi-runtime.js";
+import { buildDeviceCodeTelegramMessage } from "../transport/telegram/device-code-message.js";
 import { configFile, ensureArisaHome } from "./paths.js";
 
 const ARISA_BANNER = [
@@ -424,8 +425,8 @@ async function runTelegramBootstrap({ telegramApiKey, setupToken, botInfo }) {
         ].join("\n"));
       },
       onDeviceCode: async ({ userCode, verificationUri, expiresInSeconds }) => {
-        const expiry = expiresInSeconds ? `\nExpires in ${Math.round(expiresInSeconds / 60)} minute(s).` : "";
-        await sendSetupMessage(`Open this URL: ${verificationUri}\nThen enter code: ${userCode}${expiry}`);
+        const { text, ...options } = buildDeviceCodeTelegramMessage({ userCode, verificationUri, expiresInSeconds });
+        await sendSetupMessage(text, options);
       },
       onPrompt: async ({ message, controller }) => {
         await sendSetupMessage(`${message}\nReply here with the value.`);

package/src/runtime/paths.js

@@ -5,9 +5,12 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 
 export const arisaPackageDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "..");
-export const arisaHomeDir = path.join(os.homedir(), ".arisa");
+export const arisaHomeDir = process.env.ARISA_HOME
+  ? path.resolve(process.env.ARISA_HOME)
+  : path.join(os.homedir(), ".arisa");
 export const stateDir = path.join(arisaHomeDir, "state");
 export const configFile = path.join(stateDir, "config.json");
+export const piAuthFile = path.join(stateDir, "pi-auth.json");
 export const servicePidFile = path.join(stateDir, "arisa.pid");
 export const serviceLogFile = path.join(stateDir, "arisa.log");
 export function createIpcSocketPath({ homeDir = arisaHomeDir, platform = process.platform } = {}) {

package/src/transport/telegram/bot.js

@@ -1,7 +1,8 @@
 import { Bot, InputFile } from "grammy";
 import path from "node:path";
 import { authorizeChat } from "./auth.js";
-import { captureIncomingArtifact } from "./media.js";
+import { captureIncomingArtifact, formatLocationText } from "./media.js";
+import { buildDeviceCodeTelegramMessage } from "./device-code-message.js";
 import { renderTelegramHtml } from "./text-format.js";
 import { buildPiAuthRecoveryBlockedMessage, buildPiAuthTelegramMessage, getErrorMessage, getPiAuthIssue, getPiAuthStatus } from "../../core/agent/auth-flow.js";
 import { createPiOAuthLogin } from "../../core/agent/pi-auth-login.js";
@@ -29,6 +30,7 @@ function quotedMessageSummary(message) {
   if (message.document) parts.push(`quotedKind: document`);
   if (message.video) parts.push(`quotedKind: video`);
   if (message.sticker) parts.push(`quotedKind: sticker`);
+  if (message.location) parts.push(`quotedKind: location`, `quotedLocation: ${formatLocationText(message)}`);
 
   if (!message.text && !message.caption) {
     parts.push(`Important: this message replies to a Telegram message with no textual body available in the update. Use the quoted kind and metadata as context.`);
@@ -45,7 +47,7 @@ function getTelegramCommand(ctx) {
 }
 
 function getIncomingMessageText(message) {
-  return message?.text || message?.caption || "";
+  return message?.text || message?.caption || formatLocationText(message) || "";
 }
 
 function baseMimeType(mimeType = "") {
@@ -364,8 +366,9 @@ export async function createTelegramBot({ config, artifactStore, toolRegistry, t
         ].join("\n"));
       },
       onDeviceCode: async ({ userCode, verificationUri, expiresInSeconds }) => {
-        const expiry = expiresInSeconds ? `\nExpires in ${Math.round(expiresInSeconds / 60)} minute(s).` : "";
-        await bot.api.sendMessage(chatId, `Open this URL: ${verificationUri}\nThen enter code: ${userCode}${expiry}`);
+        const payload = buildDeviceCodeTelegramMessage({ userCode, verificationUri, expiresInSeconds });
+        const { text, ...options } = payload;
+        await bot.api.sendMessage(chatId, text, options);
       },
       onPrompt: async ({ message, controller }) => {
         await bot.api.sendMessage(chatId, `${message}\nReply here with the value.`);

package/src/transport/telegram/device-code-message.js

@@ -0,0 +1,48 @@
+import { escapeHtml } from "./text-format.js";
+
+const maxCopyTextLength = 256;
+const maxButtonLabelLength = 64;
+
+function truncateButtonLabel(text = "") {
+  const source = String(text || "").trim();
+  if (source.length <= maxButtonLabelLength) return source;
+  return `${source.slice(0, maxButtonLabelLength - 1)}…`;
+}
+
+export function buildDeviceCodeTelegramMessage({ userCode, verificationUri, expiresInSeconds } = {}) {
+  const code = String(userCode || "").trim();
+  const uri = String(verificationUri || "").trim();
+  const expiry = expiresInSeconds
+    ? `\nExpires in ${Math.round(expiresInSeconds / 60)} minute(s).`
+    : "";
+
+  const lines = [
+    "Open this URL:",
+    uri ? `<a href="${escapeHtml(uri)}">${escapeHtml(uri)}</a>` : "",
+    "Then enter code:",
+    code ? `<code>${escapeHtml(code)}</code>` : "",
+    escapeHtml(expiry.trim())
+  ].filter(Boolean);
+
+  const payload = {
+    text: lines.join("\n"),
+    parse_mode: "HTML",
+    link_preview_options: { is_disabled: true }
+  };
+
+  const buttons = [];
+  if (code && code.length <= maxCopyTextLength) {
+    buttons.push({
+      text: truncateButtonLabel(`Copy code: ${code}`),
+      copy_text: { text: code }
+    });
+  }
+  if (uri) {
+    buttons.push({ text: "Open login page", url: uri });
+  }
+  if (buttons.length) {
+    payload.reply_markup = { inline_keyboard: [buttons] };
+  }
+
+  return payload;
+}

package/src/transport/telegram/media.js

@@ -32,6 +32,20 @@ function incomingCaptionMetadata(ctx) {
   return ctx.message?.caption ? { caption: ctx.message.caption } : {};
 }
 
+export function formatLocationText(message) {
+  const location = message?.venue?.location || message?.location;
+  if (!location) return "";
+
+  const venue = message.venue;
+  const lines = [];
+  if (venue?.title) lines.push(`Venue: ${venue.title}`);
+  if (venue?.address) lines.push(`Address: ${venue.address}`);
+  lines.push(`Latitude: ${location.latitude}`);
+  lines.push(`Longitude: ${location.longitude}`);
+  lines.push(`Maps: https://maps.google.com/?q=${location.latitude},${location.longitude}`);
+  return lines.join("\n");
+}
+
 export async function captureIncomingArtifact(ctx, artifactStore) {
   const chatId = ctx.chat.id;
   const store = artifactStore.forChat(chatId);
@@ -124,6 +138,14 @@ export async function captureIncomingArtifact(ctx, artifactStore) {
     });
   }
 
+  if (ctx.message?.location) {
+    return store.createText({
+      text: formatLocationText(ctx.message),
+      source: baseSource,
+      metadata: { visibility: "internal", representation: "inline-message" }
+    });
+  }
+
   if (ctx.message?.text) {
     return store.createText({
       text: ctx.message.text,

package/src/transport/telegram/text-format.js

@@ -1,4 +1,4 @@
-function escapeHtml(text = "") {
+export function escapeHtml(text = "") {
   return text
     .replace(/&/g, "&")
     .replace(/</g, "&lt;")

package/test/device-code-message.test.js

@@ -0,0 +1,42 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { buildDeviceCodeTelegramMessage } from "../src/transport/telegram/device-code-message.js";
+
+test("builds a copyable device-code Telegram message with HTML and inline buttons", () => {
+  const payload = buildDeviceCodeTelegramMessage({
+    userCode: "TR2S-K4GBZ",
+    verificationUri: "https://auth.openai.com/codex/device",
+    expiresInSeconds: 900
+  });
+
+  assert.equal(payload.parse_mode, "HTML");
+  assert.match(payload.text, /https:\/\/auth\.openai\.com\/codex\/device/);
+  assert.match(payload.text, /<code>TR2S-K4GBZ<\/code>/);
+  assert.match(payload.text, /Expires in 15 minute\(s\)\./);
+  assert.deepEqual(payload.reply_markup.inline_keyboard, [[
+    { text: "Copy code: TR2S-K4GBZ", copy_text: { text: "TR2S-K4GBZ" } },
+    { text: "Open login page", url: "https://auth.openai.com/codex/device" }
+  ]]);
+  assert.deepEqual(payload.link_preview_options, { is_disabled: true });
+});
+
+test("escapes HTML-sensitive device-code values", () => {
+  const payload = buildDeviceCodeTelegramMessage({
+    userCode: "A&B<1>",
+    verificationUri: "https://example.com/?q=\"x\""
+  });
+
+  assert.match(payload.text, /<code>A&amp;B&lt;1&gt;<\/code>/);
+  assert.match(payload.text, /href="https:\/\/example\.com\/\?q=&quot;x&quot;"/);
+  assert.equal(payload.reply_markup.inline_keyboard[0][0].copy_text.text, "A&B<1>");
+});
+
+test("omits copy button when code exceeds Telegram copy_text limit", () => {
+  const payload = buildDeviceCodeTelegramMessage({
+    userCode: "x".repeat(257),
+    verificationUri: "https://example.com/device"
+  });
+
+  assert.equal(payload.reply_markup.inline_keyboard[0].length, 1);
+  assert.equal(payload.reply_markup.inline_keyboard[0][0].text, "Open login page");
+});

package/test/paths.test.js

@@ -1,6 +1,10 @@
 import assert from "node:assert/strict";
+import { execFile } from "node:child_process";
+import { mkdtemp, rm } from "node:fs/promises";
+import os from "node:os";
 import path from "node:path";
 import test from "node:test";
+import { promisify } from "node:util";
 import {
   chatsDir,
   createIpcSocketPath,
@@ -11,6 +15,8 @@ import {
   stateDir
 } from "../src/runtime/paths.js";
 
+const execFileAsync = promisify(execFile);
+
 test("keeps chat artifact paths scoped below the chat directory", () => {
   const artifactsDir = getChatArtifactsDir("chat-1");
 
@@ -52,3 +58,25 @@ test("creates POSIX IPC socket paths under the state directory", () => {
 
   assert.equal(socketPath, path.join("/tmp/arisa-home", "state", "arisa.sock"));
 });
+
+test("uses ARISA_HOME for instance-scoped paths", async (t) => {
+  const customHome = await mkdtemp(path.join(os.tmpdir(), "arisa-home-"));
+  t.after(() => rm(customHome, { recursive: true, force: true }));
+
+  const script = `
+const paths = await import(${JSON.stringify(new URL("../src/runtime/paths.js", import.meta.url).href)});
+process.stdout.write(JSON.stringify({
+  arisaHomeDir: paths.arisaHomeDir,
+  configFile: paths.configFile,
+  piAuthFile: paths.piAuthFile
+}));
+`;
+  const { stdout } = await execFileAsync(process.execPath, ["--input-type=module", "--eval", script], {
+    env: { ...process.env, ARISA_HOME: customHome }
+  });
+  const paths = JSON.parse(stdout);
+
+  assert.equal(paths.arisaHomeDir, path.resolve(customHome));
+  assert.equal(paths.configFile, path.join(customHome, "state", "config.json"));
+  assert.equal(paths.piAuthFile, path.join(customHome, "state", "pi-auth.json"));
+});

package/test/telegram-text-artifact.test.js

@@ -79,3 +79,64 @@ test("marks incoming Telegram text artifacts as internal inline messages", async
     representation: "inline-message"
   });
 });
+
+function createLocationContext({ location, venue } = {}) {
+  return {
+    chat: { id: 123 },
+    from: { id: 456, username: "martin" },
+    msg: { message_id: 789 },
+    message: {
+      message_id: 789,
+      location: location || { latitude: 40.4168, longitude: -3.7038 },
+      ...(venue ? { venue } : {})
+    }
+  };
+}
+
+test("turns a shared Telegram location into a processable text artifact", async () => {
+  const artifactStore = {
+    forChat: () => ({
+      createText: async (request) => ({ id: "artifact-1", kind: "text", mimeType: "text/plain", ...request })
+    })
+  };
+
+  const artifact = await captureIncomingArtifact(createLocationContext(), artifactStore);
+
+  assert.match(artifact.text, /Latitude: 40\.4168/);
+  assert.match(artifact.text, /Longitude: -3\.7038/);
+  assert.match(artifact.text, /Maps: https:\/\/maps\.google\.com\/\?q=40\.4168,-3\.7038/);
+});
+
+test("includes venue title and address when a location is shared as a venue", async () => {
+  const artifactStore = {
+    forChat: () => ({
+      createText: async (request) => ({ id: "artifact-1", kind: "text", mimeType: "text/plain", ...request })
+    })
+  };
+
+  const ctx = createLocationContext({
+    venue: { title: "Cafe Tortoni", address: "Av. de Mayo 825", location: { latitude: -34.6083, longitude: -58.3712 } }
+  });
+
+  const artifact = await captureIncomingArtifact(ctx, artifactStore);
+
+  assert.match(artifact.text, /Venue: Cafe Tortoni/);
+  assert.match(artifact.text, /Address: Av\. de Mayo 825/);
+  assert.match(artifact.text, /Latitude: -34\.6083/);
+});
+
+test("surfaces shared location coordinates inline in the agent prompt", () => {
+  const ctx = createLocationContext();
+  const prompt = buildPrompt({
+    ctx,
+    artifact: {
+      id: "artifact-1",
+      kind: "text",
+      mimeType: "text/plain",
+      text: "Latitude: 40.4168\nLongitude: -3.7038\nMaps: https://maps.google.com/?q=40.4168,-3.7038"
+    }
+  });
+
+  assert.match(prompt, /text: Latitude: 40\.4168/);
+  assert.doesNotMatch(prompt, /artifactId: artifact-1/);
+});