ticlawk 0.1.17-dev.17 → 0.1.17-dev.19

package/src/adapters/ticlawk/index.mjs

@@ -9,17 +9,15 @@ import { getActiveProfile, ensureLegacyProfile, readProfileMeta, saveAndActivate
 import { isTerminalRuntimeFailure } from '../../core/runtime-support.mjs';
 import { clearUpdateRequiredState, readUpdateState, setUpdateRequiredState } from '../../core/update-state.mjs';
 import { isManagedInstall, startDetachedSelfUpdate } from '../../core/update.mjs';
+import { buildIncomingMessagePrompt } from '../../runtimes/_shared/incoming-message-prompt.mjs';
 import * as api from './api.mjs';
-import { persistApiCredential, persistRuntimeCredentials } from './credentials.mjs';
+import { persistApiCredential } from './credentials.mjs';
 import { TiclawkWakeClient } from './wake-client.mjs';
-import { buildInboundWakePrompt } from '../../runtimes/_shared/wake-prompt.mjs';
-import { buildGoalStepPrompt } from '../../runtimes/_shared/goal-step-prompt.mjs';
 
 const require = createRequire(import.meta.url);
 const qrcode = require('qrcode-terminal');
 const JOBS_WAKE_DEBOUNCE_MS = 100;
 const BINDINGS_WAKE_DEBOUNCE_MS = 500;
-const CREDENTIALS_WAKE_DEBOUNCE_MS = 500;
 const RECOVERY_AUDIT_INTERVAL_MS = 5 * 60 * 1000;
 const BINDING_AUDIT_INTERVAL_MS = 5 * 60 * 1000;
 const UPDATE_RETRY_COOLDOWN_MS = 15 * 60 * 1000;
@@ -80,28 +78,24 @@ export function normalizeInboundMessage(msg) {
   const messageId = msg.id || msg.message_id || null;
   const deliveryId = msg.delivery_id || null;
   const media = normalizeInboundMediaAssets(msg);
-  const enriched = { ...msg, id: messageId };
-  const isTransition = msg.reason === 'transition';
-  // A transition delivery is a goal-lane FSM step, not a chat message: it has
-  // no backing message, so build a per-step goal prompt from its payload.
-  const wakePrompt = isTransition ? buildGoalStepPrompt(enriched) : buildInboundWakePrompt(enriched);
+  const prompt = buildIncomingMessagePrompt({ ...msg, id: messageId });
   return {
     bindingId: recipientAgentId,
     messageId,
     deliveryId,
     conversationId: msg.conversation_id || null,
-    lane: isTransition ? 'goal' : 'chat',
     seq: msg.seq != null ? Number(msg.seq) : null,
     senderType: msg.sender_type || 'human',
-    envelopeHeader: wakePrompt.header,
-    envelopeTarget: wakePrompt.target,
-    text: wakePrompt.text,
-    rawText: wakePrompt.rawText,
-    action: isTransition ? 'transition' : (msg.action || (media.length > 0 ? 'image' : 'task')),
+    envelopeHeader: prompt.header,
+    envelopeTarget: prompt.target,
+    text: prompt.text,
+    rawText: prompt.rawText,
+    action: msg.action || (media.length > 0 ? 'image' : 'task'),
     media,
     raw: {
       ...msg,
       id: messageId,
+      type: prompt.type,
     },
   };
 }
@@ -135,19 +129,6 @@ function getAgentIdFromPayload(payload) {
   return String(payload?.recipient_agent_id || '').trim();
 }
 
-// Two lanes run concurrently per agent (see the lane-aware claim RPC):
-// the goal lane carries FSM transition deliveries (reason='transition'),
-// everything else is the user-facing chat lane. The claim unit and the
-// daemon's in-flight key are the (agent, lane) channel, so a running chat
-// turn and a running goal transition never block each other.
-function getDeliveryLaneFromPayload(payload) {
-  return payload?.reason === 'transition' ? 'goal' : 'chat';
-}
-
-function channelKeyFor(agentId, lane) {
-  return `${agentId}:${lane}`;
-}
-
 // Whitelist of meta keys runtimes actually consume. Anything else in
 // the source row's meta blob is dropped on the floor so stale fields
 // (like the post-Y2 workdir/cwd/projectDir leftovers) can't sneak
@@ -158,11 +139,6 @@ const RUNTIME_META_KEYS = [
   'runtimePath',
   'rotatePending',
   'lastRotatedAt',
-  // Per-lane scoped session maps (keyed by conversation): the chat lane and
-  // the goal-FSM lane keep separate runtime sessions so a transition turn
-  // never resumes a user-chat session or vice-versa.
-  'chatSessions',
-  'goalSessions',
   // claude_code
   'claudePath',
   'claudeVersion',
@@ -279,31 +255,6 @@ function getRuntimeWorkdir(runtimeMeta = {}) {
   return String(runtimeMeta.workdir || runtimeMeta.cwd || runtimeMeta.projectDir || '').trim();
 }
 
-function compareStrings(a, b) {
-  const av = String(a || '');
-  const bv = String(b || '');
-  if (av < bv) return -1;
-  if (av > bv) return 1;
-  return 0;
-}
-
-function compareNumbers(a, b) {
-  const av = Number(a);
-  const bv = Number(b);
-  const aFinite = Number.isFinite(av);
-  const bFinite = Number.isFinite(bv);
-  if (aFinite && bFinite && av !== bv) return av - bv;
-  if (aFinite !== bFinite) return aFinite ? -1 : 1;
-  return 0;
-}
-
-function compareClaimedDeliveries(a, b) {
-  return compareStrings(a?.created_at, b?.created_at)
-    || compareStrings(a?.conversation_id, b?.conversation_id)
-    || compareNumbers(a?.seq, b?.seq)
-    || compareStrings(a?.delivery_id, b?.delivery_id);
-}
-
 function runtimeLabel(runtime) {
   if (runtime === 'claude_code') return 'Claude Code';
   if (runtime === 'opencode') return 'OpenCode';
@@ -417,10 +368,8 @@ export function createTiclawkAdapter(ctx) {
   let bindingAuditTimer = null;
   let jobsWakeTimer = null;
   let bindingsWakeTimer = null;
-  let credentialsWakeTimer = null;
   let lastJobsWakeAt = 0;
   let lastBindingsWakeAt = 0;
-  let lastCredentialsWakeAt = 0;
   let updateRequired = null;
   let lastUpdateRequiredLogAt = 0;
 
@@ -596,7 +545,7 @@ export function createTiclawkAdapter(ctx) {
 
         const binding = await ctx.persistBinding(buildBindingFromSource(msg));
         if (!binding?.runtime) {
-          throw new Error('claimed delivery missing runtime binding');
+          throw new Error('claimed message missing runtime binding');
         }
         if (!belongsToRuntimeHost(binding, hostId)) {
           await api.releaseDelivery(deliveryId, hostId, 'binding-host-mismatch');
@@ -664,91 +613,6 @@ export function createTiclawkAdapter(ctx) {
     }
   }
 
-  // The goal lane's canonical completion is `ticlawk goal report`, which
-  // completes the transition delivery inside report_goal_transition (before
-  // emitting the next step) so the live-transition slot frees up. By the time
-  // the turn returns the row is usually already 'completed', so this
-  // best-effort complete then 409s — that is the expected healthy path, not an
-  // error. A turn that finished without reporting leaves the row 'claimed' for
-  // stale-claimed recovery.
-  async function completeGoalDelivery(deliveryId) {
-    try {
-      await api.completeDelivery(deliveryId, hostId);
-    } catch (err) {
-      if (err?.status === 409) return;
-      throw err;
-    }
-  }
-
-  async function processGoalTransitionsForAgent(agentId, messages) {
-    for (const msg of messages) {
-      const deliveryId = msg.delivery_id;
-      const step = msg?.payload?.step || null;
-      try {
-        const messageHostId = getRuntimeHostIdFromPayload(msg);
-        if (messageHostId && messageHostId !== hostId) {
-          await api.releaseDelivery(deliveryId, hostId, 'host-mismatch');
-          continue;
-        }
-
-        const binding = await ctx.persistBinding(buildBindingFromSource(msg));
-        if (!binding?.runtime) {
-          throw new Error('claimed transition missing runtime binding');
-        }
-        if (!belongsToRuntimeHost(binding, hostId)) {
-          await api.releaseDelivery(deliveryId, hostId, 'binding-host-mismatch');
-          continue;
-        }
-
-        const completed = await ctx.bus.dispatchToAgent(binding.runtime, binding.id, normalizeInboundMessage(msg));
-        if (completed !== true) {
-          if (isTerminalRuntimeFailure(completed)) {
-            await completeGoalDelivery(deliveryId);
-            void requestDrain('transition.terminal-completed');
-            debugError('ticlawk', 'transition.terminal-failed', {
-              agentId,
-              deliveryId,
-              step,
-              runtime: binding.runtime,
-              reason: completed.reason || 'runtime terminal failure',
-            });
-            continue;
-          }
-          throw new Error('runtime did not complete transition turn');
-        }
-        await completeGoalDelivery(deliveryId);
-        void requestDrain('transition.completed');
-        debugLog('ticlawk', 'transition.completed', {
-          agentId,
-          deliveryId,
-          step,
-          runtime: binding.runtime,
-        });
-      } catch (err) {
-        if (api.isUpdateRequiredError(err)) {
-          recordUpdateRequired(err, 'transition.dispatch');
-        }
-        try {
-          await api.releaseDelivery(deliveryId, hostId, 'transition-dispatch-error');
-        } catch (releaseErr) {
-          debugError('ticlawk', 'transition.release-failed', {
-            agentId,
-            deliveryId,
-            hostId,
-            error: releaseErr?.message || 'unknown error',
-          });
-        }
-        debugError('ticlawk', 'transition.dispatch-failed', {
-          agentId,
-          deliveryId,
-          step,
-          hostId,
-          error: err?.message || 'unknown error',
-        });
-      }
-    }
-  }
-
   async function refreshBindings(reason = 'manual') {
     let channels = [];
     const startedAt = Date.now();
@@ -787,27 +651,6 @@ export function createTiclawkAdapter(ctx) {
           error: err?.message || 'unknown error',
         });
       }
-
-      // Agents created from the App via POST /me/agents land here in
-      // status='unpaired'. Once we've successfully registered the
-      // binding locally, flip them to 'connected' — same end state the
-      // legacy QR pairing flow leaves agents in. spawn itself stays
-      // lazy (happens on first delivery via deliverTurn).
-      if (agent.status === 'unpaired' && agentHostId === hostId) {
-        try {
-          await api.updateAgent(agent.id, {
-            status: 'connected',
-            runtime_host_id: hostId,
-            runtime_host_label: getHostLabel(),
-          });
-          debugLog('ticlawk', 'binding.unpaired-claimed', { agentId: agent.id });
-        } catch (err) {
-          debugError('ticlawk', 'binding.unpaired-claim-failed', {
-            agentId: agent.id,
-            error: err?.message || 'unknown error',
-          });
-        }
-      }
     }
     const pruned = await pruneDeletedBindings(channels, reason);
     debugLog('ticlawk', 'binding.refresh-ok', {
@@ -822,33 +665,6 @@ export function createTiclawkAdapter(ctx) {
     return hydrated;
   }
 
-  const syncCredentials = coalesce(async (reason = 'manual') => {
-    const startedAt = Date.now();
-    try {
-      const payload = await api.fetchCredentials();
-      const credentials = Array.isArray(payload?.credentials) ? payload.credentials : [];
-      const result = persistRuntimeCredentials(credentials);
-      debugLog('ticlawk-credentials', 'sync-ok', {
-        reason,
-        saved: result.saved,
-        removed: result.removed,
-        durationMs: Date.now() - startedAt,
-        wakeToSyncMs: String(reason || '').startsWith('wake') && lastCredentialsWakeAt
-          ? Date.now() - lastCredentialsWakeAt
-          : null,
-      });
-    } catch (err) {
-      if (api.isUpdateRequiredError(err)) {
-        recordUpdateRequired(err, 'credentials.sync');
-      }
-      debugError('ticlawk-credentials', 'sync-failed', {
-        reason,
-        durationMs: Date.now() - startedAt,
-        error: err?.message || 'unknown error',
-      });
-    }
-  });
-
   async function releaseBlockedRows(agentId, messages, reason) {
     for (const msg of messages) {
       if (!msg?.delivery_id) continue;
@@ -897,8 +713,7 @@ export function createTiclawkAdapter(ctx) {
       return { failed: true, claimed: 0, launched: 0 };
     }
 
-    const orderedData = Array.isArray(data) ? [...data].sort(compareClaimedDeliveries) : [];
-    const claimed = orderedData.length;
+    const claimed = Array.isArray(data) ? data.length : 0;
     debugLog('ticlawk', 'claim.result', {
       reason,
       hostId,
@@ -917,12 +732,12 @@ export function createTiclawkAdapter(ctx) {
       });
     }
 
-    if (orderedData.length === 0) {
+    if (!Array.isArray(data) || data.length === 0) {
       return { failed: false, claimed: 0, launched: 0 };
     }
 
     const grouped = new Map();
-    for (const msg of orderedData) {
+    for (const msg of data) {
       const agentId = getAgentIdFromPayload(msg);
       if (!agentId) {
         // Claim rows must carry the recipient agent id; a missing value
@@ -935,39 +750,33 @@ export function createTiclawkAdapter(ctx) {
         });
         continue;
       }
-      const lane = getDeliveryLaneFromPayload(msg);
-      const channelKey = channelKeyFor(agentId, lane);
-      const bucket = grouped.get(channelKey) || { agentId, lane, messages: [] };
-      bucket.messages.push(msg);
-      grouped.set(channelKey, bucket);
+      const bucket = grouped.get(agentId) || [];
+      bucket.push(msg);
+      grouped.set(agentId, bucket);
     }
 
     let launched = 0;
-    for (const [channelKey, { agentId, lane, messages }] of grouped.entries()) {
-      if (processingChannels.has(channelKey)) {
+    for (const [agentId, messages] of grouped.entries()) {
+      if (processingChannels.has(agentId)) {
         debugError('ticlawk', 'claim.blocked-claimed-rows', {
           reason,
-          channelKey,
           agentId,
-          lane,
           blockedRows: messages.length,
         });
         await releaseBlockedRows(agentId, messages, reason);
         continue;
       }
-      const run = (lane === 'goal'
-        ? processGoalTransitionsForAgent(agentId, messages)
-        : processPendingMessagesForAgent(agentId, messages))
+      const run = processPendingMessagesForAgent(agentId, messages)
         .catch(() => {})
         .finally(() => {
-          processingChannels.delete(channelKey);
+          processingChannels.delete(agentId);
           void requestDrain('channel.completed');
         });
-      processingChannels.set(channelKey, run);
+      processingChannels.set(agentId, run);
       launched += messages.length;
     }
 
-    return { failed: false, claimed: orderedData.length, launched };
+    return { failed: false, claimed: data.length, launched };
   }
 
   async function runDrain(reason) {
@@ -1006,15 +815,6 @@ export function createTiclawkAdapter(ctx) {
     bindingsWakeTimer.unref?.();
   }
 
-  function scheduleCredentialSync(reason) {
-    credentialsWakeTimer = clearDebounce(credentialsWakeTimer);
-    credentialsWakeTimer = setTimeout(() => {
-      credentialsWakeTimer = null;
-      void syncCredentials(reason);
-    }, CREDENTIALS_WAKE_DEBOUNCE_MS);
-    credentialsWakeTimer.unref?.();
-  }
-
   async function reportHostCapabilitiesNow() {
     const entries = await Promise.all(Object.entries(ctx.runtimes || {})
       .filter(([, runtime]) => typeof runtime?.health === 'function')
@@ -1054,7 +854,6 @@ export function createTiclawkAdapter(ctx) {
       void refreshBindings('wake.hello')
         .then(() => requestDrain('wake.hello'))
         .catch(() => {});
-      void syncCredentials('wake.hello');
       void reportHostCapabilitiesNow();
       return;
     }
@@ -1076,17 +875,6 @@ export function createTiclawkAdapter(ctx) {
       scheduleRefreshAndDrain('wake.bindings.changed');
       return;
     }
-    if (event?.type === 'credentials.changed') {
-      lastCredentialsWakeAt = Date.now();
-      debugLog('ticlawk-wake', 'credentials.changed', {
-        credentialId: event.credential_id || null,
-        name: event.name || null,
-        status: event.status || null,
-        reason: event.reason || null,
-      });
-      scheduleCredentialSync('wake.credentials.changed');
-      return;
-    }
     if (event?.type === 'auth.revoked') {
       wakeState.lastError = 'auth revoked';
       debugError('ticlawk-wake', 'auth.revoked', {});
@@ -1121,17 +909,7 @@ export function createTiclawkAdapter(ctx) {
 
   function connectWakeSocket() {
     connectorSocket = new TiclawkWakeClient({
-      // host_id rides on the WS query string so connector-wake can flip
-      // runtime_hosts.online for the right row. Empty host_id is
-      // tolerated by the server (it just skips the state write).
-      getUrl: () => {
-        const base = String(api.getConnectorWsUrl() || '').trim();
-        if (!base) return '';
-        const hostId = String(getHostId() || '').trim();
-        if (!hostId) return base;
-        const sep = base.includes('?') ? '&' : '?';
-        return `${base}${sep}host_id=${encodeURIComponent(hostId)}`;
-      },
+      getUrl: api.getConnectorWsUrl,
       getApiKey: api.getApiKey,
       onEvent: handleWakeEvent,
       onStatus: handleWakeStatus,
@@ -1281,11 +1059,11 @@ export function createTiclawkAdapter(ctx) {
     id: 'ticlawk',
 
     async start() {
-      // Stale claimed deliveries are recovered conservatively by the
-      // claim RPC; this startup path only refreshes local bindings and
-      // asks for the next drain.
+      // No stale-delivery recovery anywhere — if the daemon is killed
+      // mid-claim, the row stays `claimed` forever. lease_expires_at
+      // was dropped in X1; no cron has replaced it. Rare in practice;
+      // when it happens the fix is a one-row UPDATE in supabase.
       await refreshBindings('startup');
-      await syncCredentials('startup');
       await requestDrain('startup');
       connectWakeSocket();
       startAuditTimers();

package/src/adapters/ticlawk/wake-client.mjs

@@ -165,7 +165,7 @@ export class TiclawkWakeClient {
       return;
     }
 
-    if (type === 'jobs.available' || type === 'bindings.changed' || type === 'credentials.changed') {
+    if (type === 'jobs.available' || type === 'bindings.changed') {
       this.onEvent?.(msg);
       return;
     }