svamp-cli 0.2.102 → 0.2.104

package/dist/{commands-DpRXzSr9.mjs → commands-o0MBJocy.mjs}

@@ -2,7 +2,7 @@ import { existsSync, readFileSync } from 'node:fs';
 import { execSync } from 'node:child_process';
 import { basename, resolve, join } from 'node:path';
 import os from 'node:os';
-import { F as normalizeAllowedUser, G as loadSecurityContextConfig, H as resolveSecurityContext, I as buildSecurityContextFromFlags, J as mergeSecurityContexts, c as connectToHypha, K as buildSessionShareUrl, L as computeOutboundHop, M as buildMachineShareUrl } from './run-B_FyvS11.mjs';
+import { F as normalizeAllowedUser, G as loadSecurityContextConfig, H as resolveSecurityContext, I as buildSecurityContextFromFlags, J as mergeSecurityContexts, c as connectToHypha, K as buildSessionShareUrl, L as computeOutboundHop, M as buildMachineShareUrl } from './run-CoaYIdw1.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -786,7 +786,6 @@ function formatPeerLine(s) {
 }
 async function sessionWhoami(opts) {
   const currentSessionId = process.env.SVAMP_SESSION_ID;
-  const PEER_CAP = 18;
   const { server, machines } = await connectAndGetAllMachines();
   try {
     const perMachine = await Promise.allSettled(
@@ -814,9 +813,14 @@ async function sessionWhoami(opts) {
     }
     if (opts?.json) {
       console.log(formatJson({
+        operator: server.config?.user?.email || gathered.find((g) => g.info?.metadata?.sharing?.owner)?.info?.metadata?.sharing?.owner || null,
+        workspace: server.config?.workspace || null,
         currentSessionId: currentSession?.sessionId || currentSessionId || null,
         currentMachine: current ? machineLabel(current.info) : null,
+        totalSessions: gathered.reduce((n, g) => n + g.sessions.length, 0),
         machines: gathered.map((g) => ({
+          sessionCount: g.sessions.length,
+          activeCount: g.sessions.filter((s) => s.active).length,
           machine: machineLabel(g.info),
           isCurrent: g === current,
           sessions: g.sessions.map((s) => ({
@@ -831,7 +835,14 @@ async function sessionWhoami(opts) {
       }));
       return;
     }
+    const operatorUser = server.config?.user;
+    const operatorEmail = operatorUser?.email || gathered.find((g) => g.info?.metadata?.sharing?.owner)?.info?.metadata?.sharing?.owner;
+    const workspace = server.config?.workspace;
     const lines = ["# Your environment", ""];
+    if (operatorEmail || workspace) {
+      lines.push(`Operator: ${operatorEmail || "unknown"}${workspace ? ` \xB7 workspace ${workspace}` : ""}`);
+      lines.push("");
+    }
     if (currentSession && current) {
       const m = currentSession.metadata || {};
       lines.push("## This session");
@@ -848,30 +859,30 @@ async function sessionWhoami(opts) {
     }
     lines.push("");
     const byActive = (a, b) => (b.active ? 1 : 0) - (a.active ? 1 : 0);
-    if (current) {
-      const peers = current.sessions.filter((s) => s.sessionId !== currentSession?.sessionId).sort(byActive);
-      lines.push(`## Same machine \u2014 ${machineLabel(current.info)} (${peers.length} peer${peers.length === 1 ? "" : "s"})`);
-      if (peers.length === 0) lines.push("  (no other sessions here)");
-      const shown = opts?.all ? peers : peers.slice(0, PEER_CAP);
-      for (const s of shown) lines.push(formatPeerLine(s));
-      if (peers.length > shown.length) lines.push(`  \u2026 +${peers.length - shown.length} more \u2014 run \`svamp session whoami --all\` to see all`);
-      lines.push("");
-    }
-    const others = gathered.filter((g) => g !== current);
-    const otherTotal = others.reduce((n, g) => n + g.sessions.length, 0);
-    if (others.length > 0) {
-      lines.push(`## Other machines \u2014 same user (${otherTotal} session${otherTotal === 1 ? "" : "s"})`);
-      for (const g of others) {
-        const ms = [...g.sessions].sort(byActive);
-        lines.push(`  \u2022 ${machineLabel(g.info)} (${ms.length}):`);
-        if (ms.length === 0) lines.push("    (none)");
-        const shown = opts?.all ? ms : ms.slice(0, PEER_CAP);
-        for (const s of shown) lines.push(formatPeerLine(s));
-        if (ms.length > shown.length) lines.push(`    \u2026 +${ms.length - shown.length} more (--all)`);
+    const activeOf = (arr) => arr.filter((s) => s.active).length;
+    const grandTotal = gathered.reduce((n, g) => n + g.sessions.length, 0);
+    const orderedMachines = [...gathered].sort((a, b) => {
+      if (a === current) return -1;
+      if (b === current) return 1;
+      return b.sessions.length - a.sessions.length;
+    });
+    lines.push(`## Machines (same user) \u2014 ${grandTotal} session${grandTotal === 1 ? "" : "s"} across ${gathered.length} machine${gathered.length === 1 ? "" : "s"}`);
+    for (const g of orderedMachines) {
+      const ms = [...g.sessions].sort(byActive);
+      const here = g === current ? " (this machine)" : "";
+      lines.push(`- ${machineLabel(g.info)}${here}: ${ms.length} session${ms.length === 1 ? "" : "s"} (${activeOf(ms)} active)`);
+      if (opts?.all) {
+        const peers = g === current ? ms.filter((s) => s.sessionId !== currentSession?.sessionId) : ms;
+        for (const s of peers) lines.push(formatPeerLine(s));
       }
-      lines.push("");
     }
+    lines.push("- List sessions: `svamp session list` (add `--active`, or `-m <machine>` for one).");
+    if (!opts?.all && grandTotal > 1) {
+      lines.push("- Or `svamp session whoami --all` to list every session inline.");
+    }
+    lines.push("");
     lines.push("## Reach a peer");
+    lines.push("- `svamp session list` \u2014 find a peer's id/title, then:");
     lines.push("- `svamp session info <id>` / `svamp session messages <id>` \u2014 inspect before reaching out");
     lines.push('- `svamp session send <id> "<msg>"` \u2014 drop a message into a peer\'s inbox');
     lines.push('- Reply to an inbox message: `svamp session inbox reply <message-id> "<body>"`');
@@ -2420,8 +2431,17 @@ async function sessionInboxReply(sessionIdPartial, messageId, body, machineId) {
       console.error(`Message ${messageId} not found in inbox.`);
       process.exit(1);
     }
+    if (original.channelId && original.correlationId) {
+      const rr = await machine.sessionRPC(fullId, "channelReply", { params: { channel: original.channelId, correlationId: original.correlationId, to: original.from, body } });
+      if (rr?.error) {
+        console.error(`Channel reply failed: ${rr.error}`);
+        process.exit(1);
+      }
+      console.log(`Reply queued to "${original.from}" on channel ${original.channelId} (correlation ${original.correlationId}).`);
+      return;
+    }
     if (!original.fromSession) {
-      console.error("Cannot reply: original message has no fromSession.");
+      console.error("Cannot reply: original message has no fromSession (and not a channel message).");
       process.exit(1);
     }
     const { randomUUID } = await import('node:crypto');

package/dist/{commands-Clj_0eV6.mjs → commands-u519ohSC.mjs}

@@ -1,11 +1,11 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-import { connectAndGetMachine } from './commands-DpRXzSr9.mjs';
+import { connectAndGetMachine } from './commands-o0MBJocy.mjs';
 import 'node:fs';
 import 'node:child_process';
 import 'node:path';
 import 'node:os';
-import './run-B_FyvS11.mjs';
+import './run-CoaYIdw1.mjs';
 import 'os';
 import 'fs/promises';
 import 'url';

package/dist/{fleet-Cilkj57K.mjs → fleet-CjAI4rxS.mjs}

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import os from 'node:os';
-import { c as connectToHypha } from './run-B_FyvS11.mjs';
+import { c as connectToHypha } from './run-CoaYIdw1.mjs';
 import { PINNED_CLAUDE_CODE_VERSION } from './pinnedClaudeCode-HydRNEt7.mjs';
 import 'os';
 import 'fs/promises';

package/dist/{frpc-cJUGFtWY.mjs → frpc-B8ORdlOO.mjs}

@@ -3,14 +3,14 @@ import { mkdirSync, writeFileSync, unlinkSync, existsSync, chmodSync, readFileSy
 import { join } from 'path';
 import { homedir, platform, arch } from 'os';
 import { createHash, randomUUID } from 'crypto';
-import { h as getFrpsSubdomainHost, i as getFrpsServerPort, j as getFrpsServerAddr } from './run-B_FyvS11.mjs';
+import { h as getFrpsSubdomainHost, i as getFrpsServerPort, j as getFrpsServerAddr } from './run-CoaYIdw1.mjs';
 import 'fs/promises';
 import 'url';
 import 'node:fs';
 import 'node:child_process';
 import 'util';
-import 'node:crypto';
 import 'node:path';
+import 'node:crypto';
 import 'node:os';
 import 'node:events';
 import '@agentclientprotocol/sdk';

package/dist/{headlessCli-CZEbwp47.mjs → headlessCli-CIMYmqci.mjs}

@@ -1,5 +1,5 @@
-import { E as resolveModel, N as describeMisconfiguration, O as buildMachineDeps } from './run-B_FyvS11.mjs';
-import { handleRealtimeEvent, initMachineVoiceSession } from './sideband-DYhbiCEA.mjs';
+import { E as resolveModel, N as describeMisconfiguration, O as buildMachineDeps } from './run-CoaYIdw1.mjs';
+import { handleRealtimeEvent, initMachineVoiceSession } from './sideband-CO0bdYO_.mjs';
 import { WebSocket } from 'ws';
 import { execSync, spawn } from 'child_process';
 import 'os';
@@ -11,8 +11,8 @@ import 'crypto';
 import 'node:fs';
 import 'node:child_process';
 import 'util';
-import 'node:crypto';
 import 'node:path';
+import 'node:crypto';
 import 'node:os';
 import 'node:events';
 import '@agentclientprotocol/sdk';

package/dist/{httpServer-D9qLS8ed.mjs → httpServer-CWn3F-0t.mjs}

@@ -138,8 +138,9 @@ data: ${JSON.stringify({ error: out.error })}
         const key = (req.headers.authorization || "").replace(/^Bearer\s+/i, "") || u.searchParams.get("key") || void 0;
         const message = body.message ?? u.searchParams.get("message") ?? "";
         const from = body.from ?? u.searchParams.get("from") ?? void 0;
+        const session = body.session ?? u.searchParams.get("session") ?? void 0;
         try {
-          const out = await rpc.channelSend({ channel: channelId, message, from, key });
+          const out = await rpc.channelSend({ channel: channelId, message, from, key, session });
           json(out?.error ? 400 : 200, out);
         } catch (e) {
           json(500, { error: e?.message || String(e) });

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { c as connectToHypha, a as createSessionStore, d as daemonStatus, g as getHyphaServerUrl, r as registerMachineService, s as startDaemon, b as stopDaemon } from './run-B_FyvS11.mjs';
+export { c as connectToHypha, a as createSessionStore, d as daemonStatus, g as getHyphaServerUrl, r as registerMachineService, s as startDaemon, b as stopDaemon } from './run-CoaYIdw1.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -9,8 +9,8 @@ import 'crypto';
 import 'node:fs';
 import 'node:child_process';
 import 'util';
-import 'node:crypto';
 import 'node:path';
+import 'node:crypto';
 import 'node:os';
 import 'node:events';
 import '@agentclientprotocol/sdk';

package/dist/{package-BsbKsOb_.mjs → package-IQYoSW7o.mjs}

@@ -1,5 +1,5 @@
 var name = "svamp-cli";
-var version = "0.2.102";
+var version = "0.2.104";
 var description = "Svamp CLI — AI workspace daemon on Hypha Cloud";
 var author = "Amun AI AB";
 var license = "SEE LICENSE IN LICENSE";
@@ -19,7 +19,7 @@ var exports$1 = {
 var scripts = {
 	build: "rm -rf dist bin/skills && mkdir -p bin/skills && cp -r ../../skills/artifact bin/skills/artifact && cp -r ../../skills/loop bin/skills/loop && tsc --noEmit && pkgroll",
 	typecheck: "tsc --noEmit",
-	test: "npx tsx test/test-context-window.mjs && npx tsx test/test-instance-config.mjs && npx tsx test/test-authorize.mjs && npx tsx test/test-normalize-allowed-user.mjs && npx tsx test/test-share-url.mjs && npx tsx test/test-update-sharing-normalization.mjs && npx tsx test/test-staged-homes-sweep.mjs && npx tsx test/test-session-helpers.mjs && npx tsx test/test-cli-routing.mjs && npx tsx test/test-security-context.mjs && npx tsx test/test-isolation-decision.mjs && npx tsx test/test-loop-activation.mjs && npx tsx test/test-message-helpers.mjs && npx tsx test/test-agent-config.mjs && npx tsx test/test-wrap-command.mjs && npx tsx test/test-credential-staging.mjs && npx tsx test/test-claude-auth.mjs && npx tsx test/test-output-formatters.mjs && npx tsx test/test-inbox-guard.mjs && npx tsx test/test-agent-types.mjs && npx tsx test/test-transport.mjs && npx tsx test/test-session-update-handlers.mjs && npx tsx test/test-session-scanner.mjs && npx tsx test/test-hypha-client.mjs && npx tsx test/test-hook-settings.mjs && npx tsx test/test-session-service-logic.mjs && npx tsx test/test-daemon-persistence.mjs && npx tsx test/test-detect-isolation.mjs && npx tsx test/test-machine-service-logic.mjs && npx tsx test/test-interactive-helpers.mjs && npx tsx test/test-codex-backend.mjs && npx tsx test/test-acp-backend.mjs && npx tsx test/test-acp-bridge.mjs && npx tsx test/test-hook-server.mjs && npx tsx test/test-session-commands.mjs && npx tsx test/test-interactive-console.mjs && npx tsx test/test-session-messages.mjs && npx tsx test/test-session-send-query.mjs && npx tsx test/test-skills.mjs && npx tsx test/test-agent-grouping.mjs && npx tsx test/test-machine-list-directory.mjs && npx tsx test/test-service-commands.mjs && npx tsx test/test-supervisor.mjs && npx tsx test/test-supervisor-lock.mjs && node test/test-supervisor-restart.mjs && npx tsx test/test-clear-detection.mjs && npx tsx test/test-session-consolidation.mjs && npx tsx test/test-inbox.mjs && npx tsx test/test-session-rpc-dispatch.mjs && npx tsx test/test-sandbox-cli.mjs && npx tsx test/test-serve-manager.mjs && npx tsx test/test-serve-stability.mjs && npx tsx test/test-frpc-e2e.mjs --unit-only && node test/pinnedClaudeCode.test.mjs && node test/fleet.test.mjs && npx tsx test/test-routine.mjs && npx tsx test/test-routine-rpc.mjs && npx tsx test/test-session-file.mjs && npx tsx test/test-channel-rpc.mjs && npx tsx test/test-wise-agent.mjs && npx tsx test/test-channel-agent.mjs && npx tsx test/test-channels-service.mjs && npx tsx test/test-channel-async-reply.mjs && npx tsx test/test-wise-agent-auth.mjs && npx tsx test/test-channel-http.mjs && npx tsx test/test-wise-voice.mjs && npx tsx test/test-wise-headless.mjs && npx tsx test/test-wise-machine.mjs",
+	test: "npx tsx test/test-context-window.mjs && npx tsx test/test-instance-config.mjs && npx tsx test/test-authorize.mjs && npx tsx test/test-normalize-allowed-user.mjs && npx tsx test/test-share-url.mjs && npx tsx test/test-update-sharing-normalization.mjs && npx tsx test/test-staged-homes-sweep.mjs && npx tsx test/test-session-helpers.mjs && npx tsx test/test-cli-routing.mjs && npx tsx test/test-security-context.mjs && npx tsx test/test-isolation-decision.mjs && npx tsx test/test-loop-activation.mjs && npx tsx test/test-message-helpers.mjs && npx tsx test/test-agent-config.mjs && npx tsx test/test-wrap-command.mjs && npx tsx test/test-credential-staging.mjs && npx tsx test/test-claude-auth.mjs && npx tsx test/test-output-formatters.mjs && npx tsx test/test-inbox-guard.mjs && npx tsx test/test-agent-types.mjs && npx tsx test/test-transport.mjs && npx tsx test/test-session-update-handlers.mjs && npx tsx test/test-session-scanner.mjs && npx tsx test/test-hypha-client.mjs && npx tsx test/test-hook-settings.mjs && npx tsx test/test-session-service-logic.mjs && npx tsx test/test-daemon-persistence.mjs && npx tsx test/test-detect-isolation.mjs && npx tsx test/test-machine-service-logic.mjs && npx tsx test/test-interactive-helpers.mjs && npx tsx test/test-codex-backend.mjs && npx tsx test/test-acp-backend.mjs && npx tsx test/test-acp-bridge.mjs && npx tsx test/test-hook-server.mjs && npx tsx test/test-session-commands.mjs && npx tsx test/test-interactive-console.mjs && npx tsx test/test-session-messages.mjs && npx tsx test/test-session-send-query.mjs && npx tsx test/test-skills.mjs && npx tsx test/test-agent-grouping.mjs && npx tsx test/test-machine-list-directory.mjs && npx tsx test/test-service-commands.mjs && npx tsx test/test-supervisor.mjs && npx tsx test/test-supervisor-lock.mjs && node test/test-supervisor-restart.mjs && npx tsx test/test-clear-detection.mjs && npx tsx test/test-session-consolidation.mjs && npx tsx test/test-inbox.mjs && npx tsx test/test-session-rpc-dispatch.mjs && npx tsx test/test-sandbox-cli.mjs && npx tsx test/test-serve-manager.mjs && npx tsx test/test-serve-stability.mjs && npx tsx test/test-frpc-e2e.mjs --unit-only && node test/pinnedClaudeCode.test.mjs && node test/fleet.test.mjs && npx tsx test/test-routine.mjs && npx tsx test/test-routine-rpc.mjs && npx tsx test/test-session-file.mjs && npx tsx test/test-channel-rpc.mjs && npx tsx test/test-wise-agent.mjs && npx tsx test/test-channel-agent.mjs && npx tsx test/test-channels-service.mjs && npx tsx test/test-channel-async-reply.mjs && npx tsx test/test-channel-binding.mjs && npx tsx test/test-wise-agent-auth.mjs && npx tsx test/test-channel-http.mjs && npx tsx test/test-wise-voice.mjs && npx tsx test/test-wise-headless.mjs && npx tsx test/test-wise-machine.mjs",
 	"test:hypha": "node --no-warnings test/test-hypha-service.mjs",
 	dev: "tsx src/cli.ts",
 	"dev:daemon": "tsx src/cli.ts daemon start-sync",