ticlawk 0.1.16-dev.3 → 0.1.16-dev.30

package/src/runtimes/pi/index.mjs

@@ -6,6 +6,7 @@
 
 import { basename } from 'node:path';
 import { buildAgentRuntimeEnv } from '../../core/runtime-env.mjs';
+import { getGoalTaskProtocolOverlayKey } from '../_shared/goal-task-protocol.mjs';
 import { buildStandingPrompt } from '../_shared/standing-prompt.mjs';
 import { ensureAgentHome } from '../../core/agent-home.mjs';
 import {
@@ -22,13 +23,15 @@ import { emitWorkerEvent } from '../../core/events/worker-events.mjs';
 import {
   shouldStreamRuntime,
   createDeltaAggregator,
-  sendAdapterMessage,
-  recordActivity,
   reportSubprocessFailure,
   terminalRuntimeFailure,
   updateBindingRuntimeMeta,
+  resolveRuntimeSessionScope,
+  buildRuntimeSessionMetaPatch,
 } from '../../core/runtime-support.mjs';
 
+const standingPromptSeen = new Set();
+
 export const piRuntime = {
   name: 'pi',
 
@@ -41,6 +44,7 @@ export const piRuntime = {
       piPath,
       agentEnv,
       standingPrompt: opts.standingPrompt || null,
+      forceStandingPrompt: Boolean(opts.forceStandingPrompt),
       timeoutMs: opts.timeoutMs,
     });
   },
@@ -54,6 +58,7 @@ export const piRuntime = {
       piPath,
       agentEnv,
       standingPrompt: opts.standingPrompt || null,
+      forceStandingPrompt: Boolean(opts.forceStandingPrompt),
       timeoutMs: opts.timeoutMs,
       onEvent: opts.onEvent,
     });
@@ -122,33 +127,24 @@ export const piRuntime = {
       images = await buildPiImagesFromInbound(inbound);
       const captionText = (inbound.text || '').trim();
       if (images.length === 0 && !captionText) {
-        await sendAdapterMessage(adapter, binding, {
-          type: 'assistant',
-          text: '⚠️ Image attached, but I could not access the image data and there is no caption to fall back on. Try sending the image again, or include a text caption.',
-          media: [],
-          replyToMessageId: inbound.messageId || null,
-        });
+        // Image decode failed and no caption to fall back on. Bail
+        // without a user notice; the dead chat-projection path that
+        // used to surface such notices is gone.
         return true;
       }
-      if (images.length === 0 && captionText) {
-        await sendAdapterMessage(adapter, binding, {
-          type: 'assistant',
-          text: '⚠️ Could not access the attached image data; acting on the caption text only.',
-          media: [],
-          replyToMessageId: inbound.messageId || null,
-        });
-      }
       message = captionText || 'Please analyze the attached image(s).';
     }
 
-    const shouldRotate = !meta.sessionId || meta.rotatePending;
+    const sessionScope = resolveRuntimeSessionScope(meta, inbound);
+    const shouldRotate = sessionScope.shouldRotate;
+    const targetSessionId = shouldRotate ? null : sessionScope.sessionId;
     const deltaAggregator = createDeltaAggregator({
       flushDelta: async ({ text, sessionId, cwd }) => {
         await emitWorkerEvent({
           adapter,
           binding,
           agent: this.name,
-          sessionId: sessionId || meta.sessionId || binding.id,
+          sessionId: sessionId || targetSessionId || binding.id,
           cwd: cwd || agentHome,
           replyToMessageId: inbound.messageId || null,
           event: {
@@ -166,13 +162,22 @@ export const piRuntime = {
       const runtimePiVersion = getPiRuntimeHealth(runtimePiPath).version || meta.piVersion || null;
       const agentEnv = buildAgentRuntimeEnv({
         agentId: binding.id,
-        sessionId: meta.sessionId,
+        sessionId: targetSessionId,
         hostId: binding.runtime_host_id,
+        conversationId: inbound.conversationId,
+        messageId: inbound.messageId,
+        target: inbound.envelopeTarget,
       });
-      const standingPrompt = buildStandingPrompt({ agentId: binding.id });
+      const standingPrompt = buildStandingPrompt({ agentId: binding.id, inbound });
+      const protocolOverlayKey = getGoalTaskProtocolOverlayKey({ agentId: binding.id, inbound });
+      const standingPromptSeenKey = targetSessionId
+        ? `${binding.id}|${targetSessionId}|${protocolOverlayKey}`
+        : null;
+      const forceStandingPrompt = Boolean(standingPromptSeenKey && !standingPromptSeen.has(standingPromptSeenKey));
       const result = shouldStreamRuntime(this.name, this)
-        ? await this.runTurnStream({ sessionId: shouldRotate ? null : meta.sessionId, cwd: agentHome, piPath: runtimePiPath, agentEnv }, message, {
+        ? await this.runTurnStream({ sessionId: targetSessionId, cwd: agentHome, piPath: runtimePiPath, agentEnv }, message, {
             standingPrompt,
+            forceStandingPrompt,
             images,
             onEvent: async (event) => {
               if (event?.type === 'turn.started') {
@@ -180,7 +185,7 @@ export const piRuntime = {
                   adapter,
                   binding,
                   agent: this.name,
-                  sessionId: event.sessionId || meta.sessionId || binding.id,
+                  sessionId: event.sessionId || targetSessionId || binding.id,
                   cwd: agentHome,
                   replyToMessageId: inbound.messageId || null,
                   event: {
@@ -191,30 +196,33 @@ export const piRuntime = {
                 });
               } else if (event?.type === 'message.delta' && event.text) {
                 deltaAggregator.push(event.text, {
-                  sessionId: event.sessionId || meta.sessionId || binding.id,
+                  sessionId: event.sessionId || targetSessionId || binding.id,
                   cwd: agentHome,
                 });
               }
             },
           })
-        : await this.runTurn({ sessionId: shouldRotate ? null : meta.sessionId, cwd: agentHome, piPath: runtimePiPath, agentEnv }, message, { images, standingPrompt });
+        : await this.runTurn({ sessionId: targetSessionId, cwd: agentHome, piPath: runtimePiPath, agentEnv }, message, { images, standingPrompt, forceStandingPrompt });
 
       await deltaAggregator.flush();
+      const observedSessionId = result?.sessionId || targetSessionId;
+      if (observedSessionId) {
+        standingPromptSeen.add(`${binding.id}|${observedSessionId}|${protocolOverlayKey}`);
+      }
       const nextBinding = await updateBindingRuntimeMeta(ctx, binding, {
-        sessionId: result?.sessionId || meta.sessionId,
-        path: result?.path || meta.path || null,
+        ...buildRuntimeSessionMetaPatch(meta, sessionScope, {
+          sessionId: result?.sessionId,
+          path: result?.path,
+        }),
         runtimePath: runtimePiPath,
         piPath: runtimePiPath,
         piVersion: runtimePiVersion,
-        rotatePending: false,
-        lastRotatedAt: shouldRotate ? new Date().toISOString() : meta.lastRotatedAt,
       }, { status: 'connected' });
-      await recordActivity(adapter, nextBinding, inbound, result);
       await emitWorkerEvent({
         adapter,
         binding: nextBinding,
         agent: this.name,
-        sessionId: result?.sessionId || meta.sessionId || binding.id,
+        sessionId: result?.sessionId || targetSessionId || binding.id,
         cwd: result?.cwd || agentHome,
         replyToMessageId: inbound.messageId || null,
         event: {
@@ -230,7 +238,7 @@ export const piRuntime = {
         adapter,
         binding,
         agent: this.name,
-        sessionId: meta.sessionId || binding.id,
+        sessionId: targetSessionId || binding.id,
         cwd: agentHome,
         replyToMessageId: inbound.messageId || null,
         event: {

package/src/runtimes/pi/session.mjs

@@ -197,11 +197,14 @@ export function runPiPrompt({
   piPath = null,
   agentEnv = null,
   standingPrompt = null,
+  forceStandingPrompt = false,
   timeoutMs = Number(process.env.PI_RUN_TIMEOUT_MS || DEFAULT_PI_RUN_TIMEOUT_MS),
   onEvent,
 }) {
-  // pi has no documented system-prompt flag — prepend on first turn.
-  const finalMessage = standingPrompt && !sessionId
+  // pi has no documented system-prompt flag. Prepend on first turn, and
+  // let callers force one resumed-session injection for a newly selected
+  // protocol overlay.
+  const finalMessage = standingPrompt && (!sessionId || forceStandingPrompt)
     ? `${standingPrompt}\n\n---\n\n${message}`
     : message;
   return new Promise((resolve, reject) => {

package/src/adapters/ticlawk/cards.mjs

@@ -1,149 +0,0 @@
-/**
- * ticlawk adapter — final agent message / media write path.
- *
- * Everything here turns an agent result (text + optional media local paths)
- * into a terminal runtime result written back to ticlawk.
- *
- * This module imports from `./api.mjs` (HTTP client) and from
- * `../../core/logger.mjs` (structured logging). No runtime dependencies.
- */
-
-import { existsSync, readFileSync } from 'node:fs';
-import { extname } from 'node:path';
-import { randomUUID } from 'node:crypto';
-import * as api from './api.mjs';
-import { extractMediaPaths } from '../../core/media/outbound.mjs';
-import { debugLog, debugError } from '../../core/logger.mjs';
-import { TICLAWK_CONNECTOR_API_KEY } from '../../core/config.mjs';
-
-const MIME_MAP = {
-  '.png': 'image/png', '.jpg': 'image/jpeg', '.jpeg': 'image/jpeg',
-  '.gif': 'image/gif', '.webp': 'image/webp', '.svg': 'image/svg+xml',
-  '.mp4': 'video/mp4', '.webm': 'video/webm',
-  '.opus': 'audio/opus', '.mp3': 'audio/mpeg', '.wav': 'audio/wav',
-  '.pdf': 'application/pdf',
-};
-
-async function uploadLocalAsset(localPath) {
-  if (!process.env[TICLAWK_CONNECTOR_API_KEY]) {
-    debugError('relay', 'upload.skipped', {
-      localPath,
-      reason: 'missing connector api key',
-    });
-    return null;
-  }
-  if (!existsSync(localPath)) {
-    debugError('relay', 'upload.skipped', {
-      localPath,
-      reason: 'file not found',
-    });
-    return null;
-  }
-
-  const ext = extname(localPath).toLowerCase();
-  const contentType = MIME_MAP[ext] || 'application/octet-stream';
-  const fileName = `${Date.now()}-${randomUUID().slice(0, 8)}${ext}`;
-  const fileData = readFileSync(localPath);
-
-  try {
-    const asset = await api.uploadAsset(fileName, fileData, contentType);
-    if (!asset?.asset_id) {
-      debugError('relay', 'upload.failed', {
-        localPath,
-        fileName,
-        error: 'missing asset_id in upload response',
-      });
-      return null;
-    }
-    debugLog('relay', 'upload.ok', {
-      localPath,
-      fileName,
-      assetId: asset.asset_id,
-      contentType: asset.content_type || contentType,
-      sizeBytes: asset.size_bytes ?? null,
-    });
-    return asset;
-  } catch (err) {
-    debugError('relay', 'upload.failed', {
-      localPath,
-      fileName,
-      error: err.message,
-    });
-    return null;
-  }
-}
-
-export async function uploadMediaAssets(localPaths) {
-  const assets = [];
-  for (const p of localPaths) {
-    const asset = await uploadLocalAsset(p);
-    if (asset) assets.push(asset);
-  }
-  return assets;
-}
-
-export async function processAndSaveResult(result, opts) {
-  const { agentId: explicitAgentId, sessionKey, hostId, type, replyToMessageId, agent, sessionId, turnId, runtimeVersion } = opts;
-  const agentId = explicitAgentId || sessionKey;
-  const startedAt = Date.now();
-
-  // Collect media: from agent mediaUrls + parsed from text
-  const allLocalPaths = [...new Set([
-    ...(result.mediaUrls || []),
-    ...extractMediaPaths(result.text || ''),
-  ])];
-
-  debugLog('relay', 'process-result.begin', {
-    agentId,
-    type,
-    parentMessageId: replyToMessageId || null,
-    textLength: result.text?.length || 0,
-    localMediaCount: allLocalPaths.length,
-  });
-
-  // Upload local media to Ticlawk private chat assets.
-  const uploadedAssets = await uploadMediaAssets(allLocalPaths);
-  const uploadedAssetIds = uploadedAssets
-    .map((asset) => asset?.asset_id)
-    .filter(Boolean);
-
-  const updateId = randomUUID();
-  debugLog('relay', 'post-final.begin', {
-    agentId,
-    updateId,
-    durationMs: Date.now() - startedAt,
-    uploadedMediaCount: uploadedAssetIds.length,
-  });
-  try {
-    await api.postRuntimeResult({
-      agent,
-      agent_id: agentId,
-      runtime_host_id: hostId,
-      session_id: sessionId || null,
-      cwd: '',
-      runtime_version: runtimeVersion ?? null,
-      result_id: updateId,
-      turn_id: turnId || replyToMessageId || null,
-      reply_to_message_id: replyToMessageId || null,
-      origin_ts: new Date().toISOString(),
-      text: result.text || '',
-      media_asset_ids: uploadedAssetIds,
-      output_type: type || 'agent_message',
-    });
-  } catch (err) {
-    debugError('relay', 'post-final.failed', {
-      agentId,
-      updateId,
-      durationMs: Date.now() - startedAt,
-      error: err.message,
-    });
-    throw err;
-  }
-  debugLog('relay', 'process-result.ok', {
-    agentId,
-    updateId,
-    durationMs: Date.now() - startedAt,
-    uploadedMediaCount: uploadedAssetIds.length,
-  });
-  return { id: updateId, agentId };
-}

package/src/core/media/outbound.mjs

@@ -1,163 +0,0 @@
-import { extname } from 'node:path';
-import { homedir } from 'node:os';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-
-export const MIME_MAP = {
-  '.png': 'image/png',
-  '.jpg': 'image/jpeg',
-  '.jpeg': 'image/jpeg',
-  '.gif': 'image/gif',
-  '.webp': 'image/webp',
-  '.svg': 'image/svg+xml',
-  '.mp4': 'video/mp4',
-  '.webm': 'video/webm',
-  '.pdf': 'application/pdf',
-};
-
-function mediaExtensionPattern() {
-  return Object.keys(MIME_MAP).map((entry) => entry.replace('.', '\\.')).join('|');
-}
-
-function stripUrlSuffix(value) {
-  return String(value || '').replace(/[?#].*$/, '');
-}
-
-function trimCandidate(value) {
-  return String(value || '')
-    .trim()
-    .replace(/^<|>$/g, '')
-    .replace(/^["']|["']$/g, '')
-    .replace(/\\\//g, '/');
-}
-
-function hasKnownMediaExtension(value) {
-  return Boolean(MIME_MAP[extname(stripUrlSuffix(value)).toLowerCase()]);
-}
-
-function normalizeMediaPath(value) {
-  let candidate = trimCandidate(value);
-  if (!candidate) return null;
-
-  candidate = candidate.replace(/^about:/i, '');
-
-  if (/^file:/i.test(candidate)) {
-    try {
-      candidate = fileURLToPath(candidate);
-    } catch {
-      candidate = candidate.replace(/^file:(?:\/\/)?/i, '');
-    }
-  }
-
-  candidate = stripUrlSuffix(candidate);
-
-  if (candidate.startsWith('~')) {
-    candidate = candidate.replace(/^~/, homedir());
-  }
-
-  if (candidate.startsWith('/')) {
-    candidate = candidate.replace(/^\/{2,}/, '/');
-  }
-
-  if (!candidate.startsWith('/')) return null;
-  if (!hasKnownMediaExtension(candidate)) return null;
-  return candidate;
-}
-
-function addMediaCandidate(paths, value) {
-  const normalized = normalizeMediaPath(value);
-  if (normalized) paths.add(normalized);
-}
-
-export function extractMediaPaths(text) {
-  const extPattern = mediaExtensionPattern();
-  const paths = new Set();
-  const candidates = [];
-
-  const body = String(text || '');
-  for (const match of body.matchAll(/<img[^>]+src=["']([^"']+)["'][^>]*>/gi)) {
-    candidates.push({ index: match.index || 0, value: match[1] });
-  }
-  for (const match of body.matchAll(/!?\[[^\]]*\]\(\s*<([^>\n]+)>/gi)) {
-    candidates.push({ index: match.index || 0, value: match[1] });
-  }
-  for (const match of body.matchAll(/!?\[[^\]]*\]\(\s*([^\s)>]+)>?/gi)) {
-    candidates.push({ index: match.index || 0, value: match[1] });
-  }
-
-  const re = new RegExp(`((?:file:(?://)?|about:(?://)?)?(?:~|/{1,3})[^\\s"'<>)]*?(?:${extPattern})(?:[?#][^\\s"'<>)]*)?)`, 'gi');
-  for (const match of body.matchAll(re)) {
-    candidates.push({ index: match.index || 0, value: match[1] });
-  }
-
-  candidates
-    .sort((a, b) => a.index - b.index)
-    .forEach((candidate) => addMediaCandidate(paths, candidate.value));
-
-  return [...paths];
-}
-
-function escapeRegExp(value) {
-  return String(value).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-
-function referencesPath(value, normalizedPaths) {
-  const normalized = normalizeMediaPath(value);
-  return Boolean(normalized && normalizedPaths.has(normalized));
-}
-
-function pathReferenceVariants(path) {
-  const normalized = normalizeMediaPath(path) || path;
-  const variants = new Set([normalized]);
-  if (normalized.startsWith('/')) {
-    variants.add(pathToFileURL(normalized).href);
-    variants.add(`about:${normalized}`);
-    variants.add(`about://${normalized}`);
-  }
-  return [...variants].sort((a, b) => b.length - a.length);
-}
-
-export function stripMediaPathReferences(text, explicitPaths = []) {
-  let next = String(text || '');
-  const paths = [...new Set([
-    ...explicitPaths,
-    ...extractMediaPaths(next),
-  ].map((path) => normalizeMediaPath(path)).filter(Boolean))];
-  const normalizedPaths = new Set(paths);
-
-  next = next
-    .replace(/<img[^>]+src=["']([^"']+)["'][^>]*>/gi, (match, src) => (
-      referencesPath(src, normalizedPaths) ? '' : match
-    ))
-    .replace(/!\[[^\]]*\]\(\s*<([^>\n]+)>(?:\s+["'][^"']*["'])?\s*\)/gi, (match, target) => (
-      referencesPath(target, normalizedPaths) ? '' : match
-    ))
-    .replace(/!\[[^\]]*\]\(\s*([^\s)>]+)>?(?:\s+["'][^"']*["'])?\s*\)/gi, (match, target) => (
-      referencesPath(target, normalizedPaths) ? '' : match
-    ));
-
-  for (const path of paths) {
-    for (const variant of pathReferenceVariants(path)) {
-      const escapedPath = escapeRegExp(variant);
-      next = next
-        .replace(new RegExp(`\\[media attached[^\\]]*${escapedPath}[^\\]]*\\]\\s*`, 'gi'), '')
-        .replace(new RegExp(`^\\s*${escapedPath}\\s*$`, 'gim'), '')
-        .replace(new RegExp(escapedPath, 'g'), '');
-    }
-  }
-
-  return next
-    .replace(/<img[^>]+src=["'](?:file:|about:)(?:\/){0,3}(?:tmp|private|var|Users|home)[^"']*["'][^>]*>/gi, '')
-    .replace(/!\[[^\]]*\]\(\s*<?(?:file:|about:)(?:\/){0,3}(?:tmp|private|var|Users|home)[^)]*\)/gi, '')
-    .replace(/\n{3,}/g, '\n\n')
-    .trim();
-}
-
-export function normalizeOutboundMedia(result) {
-  const explicit = Array.isArray(result?.mediaUrls) ? result.mediaUrls : [];
-  const inferred = extractMediaPaths(result?.text || '');
-  return [...new Set([...explicit, ...inferred])].map((path) => ({
-    kind: 'local_path',
-    value: path,
-    mime: MIME_MAP[extname(path).toLowerCase()] || 'application/octet-stream',
-  }));
-}