@ctrl-spc/cli 1.1.13 → 1.1.15

package/dist/controlRequests.js

@@ -11,6 +11,14 @@ export function makeControlRequestProcessor(deps) {
             .limit(1);
         return data?.[0]?.value ?? null;
     }
+    async function resolveMachineLabel() {
+        const { data } = await deps.session.client
+            .from('devices')
+            .select('label')
+            .eq('id', deps.session.machineId)
+            .single();
+        return (data?.label ?? 'This machine').trim() || 'This machine';
+    }
     async function mark(row, patch) {
         await deps.session.client.from('agent_control_requests').update(patch).eq('id', row.id);
     }
@@ -44,7 +52,7 @@ export function makeControlRequestProcessor(deps) {
     async function findSession(row) {
         let query = deps.session.client
             .from('sessions')
-            .select('id, project_id, agent_type, model, effort, permission_mode, allowed_tools')
+            .select('id, project_id, device_id, agent_type, model, effort, permission_mode, allowed_tools')
             .eq('project_id', row.project_id)
             .is('ended_at', null);
         if (row.session_id)
@@ -66,8 +74,7 @@ export function makeControlRequestProcessor(deps) {
             throw new Error(`Message insert failed: ${error.message}`);
         return data?.id ?? null;
     }
-    async function processPing(row) {
-        const session = await findSession(row);
+    async function processPing(row, session) {
         if (!session) {
             await mark(row, completedPatch('failed', 'No active agent session was found.'));
             return;
@@ -80,15 +87,15 @@ export function makeControlRequestProcessor(deps) {
         const { cmd, args } = assembleCommand(session, PING_PROMPT);
         const handle = deps.spawnAgent(cmd, args, cwd);
         const stdout = await collectStdout(handle);
-        const responseId = await insertMessage(row, session.id, 'agent', 'ping', cleanAgentText(stdout));
+        const machineLabel = await resolveMachineLabel();
+        const responseId = await insertMessage(row, session.id, 'agent', 'ping', `${machineLabel} responded: ${cleanAgentText(stdout)}`);
         await mark(row, { ...completedPatch('succeeded'), response_message_id: responseId });
     }
-    async function processStop(row) {
+    async function processStop(row, session) {
         const owned = row.session_id
             ? deps.ownedSessions.get(row.session_id)
             : [...deps.ownedSessions.values()].find((entry) => entry.projectId === row.project_id);
         if (!owned) {
-            const session = await findSession(row);
             if (session) {
                 const endedAt = new Date(deps.now()).toISOString();
                 await deps.session.client.from('sessions').update({
@@ -117,13 +124,16 @@ export function makeControlRequestProcessor(deps) {
         await mark(row, { status: 'succeeded', completed_at: endedAt });
     }
     async function processOne(row) {
+        const session = await findSession(row);
+        if (session?.device_id && session.device_id !== deps.session.machineId)
+            return;
         await mark(row, { status: 'processing' });
         if (row.action === 'ping') {
-            await processPing(row);
+            await processPing(row, session);
             return;
         }
         if (row.action === 'stop') {
-            await processStop(row);
+            await processStop(row, session);
             return;
         }
         await mark(row, completedPatch('failed', 'This control request is not supported by this version of the daemon.'));

package/dist/daemon.js

@@ -3,6 +3,7 @@ import { loadMachineState } from './session.js';
 import { makeSpawner, nodeSpawnAgent } from './spawner.js';
 import { makeControlRequestProcessor } from './controlRequests.js';
 export const HEARTBEAT_INTERVAL_MS = 30_000;
+export const WORK_SCAN_INTERVAL_MS = 2_000;
 const SESSION_RETRY_INTERVAL_MS = 5_000;
 export async function heartbeatOnce(session, deps) {
     try {
@@ -113,14 +114,19 @@ export async function runDaemon() {
     process.once('SIGTERM', () => void shutdown());
     session = await heartbeatOnce(session, deps);
     await markRecoveredSessionsDisconnected(session, () => Date.now(), deps.log);
+    let lastHeartbeatAt = Date.now();
     let spawner = makeSpawner({ session, spawnAgent: nodeSpawnAgent, ownedSessions, now: () => Date.now(), log: deps.log });
     let controls = makeControlRequestProcessor({ session, spawnAgent: nodeSpawnAgent, ownedSessions, now: () => Date.now(), log: deps.log });
     await runSpawnScan(spawner, deps.log);
     await runControlScan(controls, deps.log);
     while (true) {
-        await sleep(HEARTBEAT_INTERVAL_MS);
-        session = await heartbeatOnce(session, deps);
-        await touchOwnedSessions(session, ownedSessions, () => Date.now(), deps.log);
+        await sleep(WORK_SCAN_INTERVAL_MS);
+        const now = Date.now();
+        if (now - lastHeartbeatAt >= HEARTBEAT_INTERVAL_MS) {
+            session = await heartbeatOnce(session, deps);
+            await touchOwnedSessions(session, ownedSessions, () => now, deps.log);
+            lastHeartbeatAt = now;
+        }
         spawner = makeSpawner({ session, spawnAgent: nodeSpawnAgent, ownedSessions, now: () => Date.now(), log: deps.log });
         controls = makeControlRequestProcessor({ session, spawnAgent: nodeSpawnAgent, ownedSessions, now: () => Date.now(), log: deps.log });
         await runSpawnScan(spawner, deps.log);

package/dist/spawner.js

@@ -77,6 +77,8 @@ export function makeSpawner(deps) {
     async function processOne(row) {
         if (!isRemote(row.agent_type))
             return; // manual types are never auto-fulfilled
+        if (row.target_device_id && row.target_device_id !== deps.session.machineId)
+            return;
         const last = lastAttempt.get(row.id);
         if (last !== undefined && deps.now() - last < backoffMs)
             return;
@@ -102,7 +104,7 @@ export function makeSpawner(deps) {
     async function processPending() {
         const { data, error } = await deps.session.client
             .from('spawn_requests')
-            .select('id, project_id, agent_type, model, effort, permission_mode, allowed_tools')
+            .select('id, project_id, target_device_id, agent_type, model, effort, permission_mode, allowed_tools')
             .eq('status', 'pending');
         if (error) {
             deps.log(`spawn_requests scan failed: ${error.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctrl-spc/cli",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "Control Space CLI - machine setup and background daemon",
   "type": "module",
   "files": [