@slock-ai/daemon 0.55.2-alpha.0 → 0.55.3

package/dist/{chunk-VOZJ2ELH.js → chunk-M2KQBJR3.js}

@@ -142,6 +142,10 @@ async function executeResponseRequest(url, init, {
 import { HttpsProxyAgent } from "https-proxy-agent";
 import { ProxyAgent } from "undici";
 var fetchDispatcherCache = /* @__PURE__ */ new Map();
+function getFetchPreResponseTimeoutMs(env) {
+  const parsed = Number.parseInt(env.SLOCK_DAEMON_FETCH_PRE_RESPONSE_TIMEOUT_MS || "", 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : 3e4;
+}
 function getDefaultPort(protocol) {
   switch (protocol) {
     case "https:":
@@ -196,24 +200,53 @@ function buildWebSocketOptions(wsUrl, env) {
     agent: new HttpsProxyAgent(proxyUrl)
   };
 }
-function buildFetchDispatcher(targetUrl, env) {
+function resolveProxyUrl(targetUrl, env) {
   const proxyUrl = getProxyUrlForTarget(targetUrl, env);
   if (!proxyUrl) return void 0;
   if (shouldBypassProxy(targetUrl, env)) return void 0;
+  return proxyUrl;
+}
+function buildFetchDispatcher(targetUrl, env) {
+  const proxyUrl = resolveProxyUrl(targetUrl, env);
+  if (!proxyUrl) return void 0;
   const cached = fetchDispatcherCache.get(proxyUrl);
   if (cached) return cached;
-  const dispatcher = new ProxyAgent(proxyUrl);
+  const timeoutMs = getFetchPreResponseTimeoutMs(env);
+  const dispatcher = new ProxyAgent({
+    uri: proxyUrl,
+    // All three are pre-response and body-agnostic (see getFetchPreResponseTimeoutMs):
+    // headersTimeout = headers-hang leg; requestTls.timeout = CONNECT-tunnel
+    // establish leg; connect.timeout = socket to the proxy itself (defensive).
+    connect: { timeout: timeoutMs },
+    requestTls: { timeout: timeoutMs },
+    headersTimeout: timeoutMs
+  });
   fetchDispatcherCache.set(proxyUrl, dispatcher);
   return dispatcher;
 }
+function evictFetchDispatcher(targetUrl, env) {
+  const proxyUrl = resolveProxyUrl(targetUrl, env);
+  if (!proxyUrl) return false;
+  const cached = fetchDispatcherCache.get(proxyUrl);
+  if (!cached) return false;
+  fetchDispatcherCache.delete(proxyUrl);
+  void Promise.resolve().then(() => cached.close()).catch(() => cached.destroy?.(new Error("evicted"))).catch(() => {
+  });
+  return true;
+}
 
 // src/daemonFetch.ts
 function withDaemonFetchProxy(input, init = {}, env = process.env) {
   const dispatcher = buildFetchDispatcher(input.toString(), env);
   return dispatcher ? { ...init, dispatcher } : init;
 }
-function daemonFetch(input, init, env = process.env) {
-  return fetch(input, withDaemonFetchProxy(input, init, env));
+async function daemonFetch(input, init, env = process.env) {
+  try {
+    return await fetch(input, withDaemonFetchProxy(input, init, env));
+  } catch (err) {
+    evictFetchDispatcher(input.toString(), env);
+    throw err;
+  }
 }
 
 export {

package/dist/cli/index.js

@@ -1183,6 +1183,17 @@ var CHANNEL_MESSAGE_RE = new RegExp(
   "iu"
 );
 
+// ../shared/src/producerFactLineage.ts
+var PRODUCER_FACT_TEXT_LABEL = "producerFactId";
+function formatProducerFactLineageNote(producerFactId) {
+  const id = normalizeProducerFactId(producerFactId);
+  return id ? `
+Lineage: ${PRODUCER_FACT_TEXT_LABEL}=${id}.` : "";
+}
+function normalizeProducerFactId(producerFactId) {
+  return typeof producerFactId === "string" ? producerFactId.trim() : "";
+}
+
 // ../shared/src/tracing/index.ts
 var DEFAULT_TRACE_FLAGS = "00";
 var TRACE_ID_HEX_LENGTH2 = 32;
@@ -15904,37 +15915,148 @@ Your last read position: seq ${data.last_read_seq}. Use slock message read --cha
 
 ${formatted}${footer}`;
 }
-function formatSearchTarget(result) {
+function renderSearchSource(result) {
   if (result.channelType === "thread") {
     const shortId = typeof result.channelName === "string" && result.channelName.startsWith("thread-") ? result.channelName.slice(7) : typeof result.threadId === "string" && result.threadId ? result.threadId.slice(0, 8) : result.channelName;
     if (result.parentChannelType === "dm") {
-      return `dm:@${result.parentChannelName}:${shortId}`;
+      return `dm:${neutralizeSlockRefLiterals(result.parentChannelName ?? "unknown")}:${shortId}`;
     }
-    return `#${result.parentChannelName}:${shortId}`;
+    return `thread:${neutralizeSlockRefLiterals(result.parentChannelName ?? "unknown")}:${shortId}`;
   }
   if (result.channelType === "dm") {
-    return `dm:@${result.channelName}`;
+    return `dm:${neutralizeSlockRefLiterals(result.channelName ?? "unknown")}`;
+  }
+  return `channel:${neutralizeSlockRefLiterals(result.channelName ?? "unknown")}`;
+}
+var PREVIEW_BEFORE_CHARS = 80;
+var PREVIEW_AFTER_CHARS = 120;
+var PREVIEW_FALLBACK_CHARS = PREVIEW_BEFORE_CHARS + PREVIEW_AFTER_CHARS;
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function findSearchMatch(content, query) {
+  const normalizedQuery = query.trim();
+  if (!normalizedQuery) return null;
+  const exactIndex = content.toLowerCase().indexOf(normalizedQuery.toLowerCase());
+  if (exactIndex >= 0) {
+    return { start: exactIndex, end: exactIndex + normalizedQuery.length };
+  }
+  const terms = normalizedQuery.match(/"([^"]+)"|\S+/g) ?? [];
+  for (const rawTerm of terms) {
+    const term = rawTerm.replace(/^"|"$/g, "").trim();
+    if (!term) continue;
+    const match = new RegExp(escapeRegExp(term), "i").exec(content);
+    if (match?.index !== void 0) {
+      return { start: match.index, end: match.index + match[0].length };
+    }
+  }
+  return null;
+}
+function* findSlockRefLiteralRanges(content) {
+  for (const match of content.matchAll(/\bdm:@[A-Za-z0-9][A-Za-z0-9_-]*/g)) {
+    if (match.index !== void 0) yield { start: match.index, end: match.index + match[0].length };
+  }
+  for (const match of content.matchAll(/\btask #[0-9]+\b/g)) {
+    if (match.index !== void 0) yield { start: match.index, end: match.index + match[0].length };
+  }
+  for (const match of content.matchAll(/(^|[\n\s([{"'`;])(@[A-Za-z0-9][A-Za-z0-9_-]*)/g)) {
+    if (match.index === void 0) continue;
+    const prefix = match[1] ?? "";
+    const ref = match[2] ?? "";
+    yield { start: match.index + prefix.length, end: match.index + prefix.length + ref.length };
+  }
+  for (const match of content.matchAll(/(^|[\n\s([{"'`;])(#[A-Za-z][A-Za-z0-9_-]*)/g)) {
+    if (match.index === void 0) continue;
+    const prefix = match[1] ?? "";
+    const ref = match[2] ?? "";
+    yield { start: match.index + prefix.length, end: match.index + prefix.length + ref.length };
+  }
+}
+function expandSearchMatchToRefLiteral(content, match) {
+  for (const refRange of findSlockRefLiteralRanges(content)) {
+    if (match.start < refRange.end && match.end > refRange.start) {
+      return {
+        start: Math.min(match.start, refRange.start),
+        end: Math.max(match.end, refRange.end)
+      };
+    }
   }
-  return `#${result.channelName}`;
+  return match;
+}
+function trimPreviewWindow(content, start, end) {
+  let trimmedStart = start;
+  let trimmedEnd = end;
+  while (trimmedStart > 0 && /\s/.test(content[trimmedStart] ?? "")) trimmedStart += 1;
+  while (trimmedEnd < content.length && /\s/.test(content[trimmedEnd - 1] ?? "")) trimmedEnd -= 1;
+  return {
+    start: Math.max(0, Math.min(trimmedStart, content.length)),
+    end: Math.max(0, Math.min(trimmedEnd, content.length))
+  };
+}
+function escapeSearchComponentLiterals(text) {
+  return text.replace(/<\/?(?:result|preview|match)\b[^>]*>|<omit\s*\/>/gi, (tag) => tag.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;"));
+}
+function neutralizeSlockRefLiterals(text) {
+  return text.replace(/\bdm:@([A-Za-z0-9][A-Za-z0-9_-]*)/g, "dm:user:$1").replace(/\btask #([0-9]+)\b/g, "task:$1").replace(/(^|[\n\s([{"'`;])@([A-Za-z0-9][A-Za-z0-9_-]*)/g, "$1user:$2").replace(/(^|[\n\s([{"'`;])#([A-Za-z][A-Za-z0-9_-]*)/g, "$1channel:$2");
+}
+function renderPreviewText(text) {
+  return neutralizeSlockRefLiterals(escapeSearchComponentLiterals(text));
+}
+function renderSearchPreview(content, query) {
+  const foundMatch = findSearchMatch(content, query);
+  const match = foundMatch ? expandSearchMatchToRefLiteral(content, foundMatch) : null;
+  let start = 0;
+  let end = Math.min(content.length, PREVIEW_FALLBACK_CHARS);
+  if (match) {
+    start = Math.max(0, match.start - PREVIEW_BEFORE_CHARS);
+    end = Math.min(content.length, match.end + PREVIEW_AFTER_CHARS);
+  }
+  ({ start, end } = trimPreviewWindow(content, start, end));
+  const leadingOmit = start > 0 ? "<omit />" : "";
+  const trailingOmit = end < content.length ? "<omit />" : "";
+  if (!match || match.end <= start || match.start >= end) {
+    return `${leadingOmit}${renderPreviewText(content.slice(start, end))}${trailingOmit}`;
+  }
+  const before = content.slice(start, match.start);
+  const matched = content.slice(match.start, match.end);
+  const after = content.slice(match.end, end);
+  return [
+    leadingOmit,
+    renderPreviewText(before),
+    "<match>",
+    renderPreviewText(matched),
+    "</match>",
+    renderPreviewText(after),
+    trailingOmit
+  ].join("");
 }
 function formatSearchResults(query, data) {
   if (!data.results || data.results.length === 0) return "No search results.";
   const formatted = data.results.map((result, index) => {
-    const target = formatSearchTarget(result);
-    const threadInfo = result.channelType === "thread" ? `
-thread: ${result.parentChannelName} -> ${target}` : "";
+    const ref = `msg:${result.id}`;
+    const content = result.content ?? result.snippet ?? "";
+    const sender = neutralizeSlockRefLiterals(result.senderName ?? "unknown");
+    const senderType = result.senderType ? ` (${result.senderType})` : "";
     return [
-      `[${index + 1}] msg=${result.id} seq=${result.seq} time=${result.createdAt ? toLocalTime(result.createdAt) : "-"}`,
-      `target: ${target}${threadInfo}`,
-      `sender: @${result.senderName} (${result.senderType})`,
-      `content: ${result.content}`,
-      `match: ${result.snippet}`,
-      `next: slock message read --channel "${target}" --around "${result.id}" --limit 20`
+      `<result ref="${ref}">`,
+      `Source: ${renderSearchSource(result)}`,
+      `Sender: ${sender}${senderType}`,
+      `Time: ${result.createdAt ? toLocalTime(result.createdAt) : "-"}`,
+      "",
+      "<preview>",
+      renderSearchPreview(content, query),
+      "</preview>",
+      "</result>"
     ].join("\n");
   }).join("\n\n");
-  return `## Search Results for "${query}" (${data.results.length} results)
-
-${formatted}`;
+  const resultLabel = data.results.length === 1 ? "result" : "results";
+  return [
+    `Search results for: "${query}" (${data.results.length} ${resultLabel})`,
+    "",
+    formatted,
+    "",
+    "If a result may be relevant but its preview is not enough, read the surrounding context for that result before answering."
+  ].join("\n");
 }
 
 // src/commands/freshnessHold.ts
@@ -15952,9 +16074,10 @@ ${formatHistory(target, { messages: data.heldMessages })}` : "";
 
 Note: ${data.mentionAnnotation.formalMentionCount} of these messages formally @mention you.` : "";
   const omittedNote = omittedMessageCount > 0 ? ` ${omittedMessageCount} earlier same-target message${omittedMessageCount === 1 ? "" : "s"} omitted from this notice and no longer block this action; use slock message read explicitly if you need earlier context.` : "";
+  const lineageNote = formatProducerFactLineageNote(data.producerFactId);
   const continueAnyway = data.continueAnywaySuggested && opts.continueAnywayInstruction ? opts.continueAnywayInstruction : "";
   return `Freshness hold: showing latest ${shownMessageCount} of ${newMessageCount} newer message${newMessageCount === 1 ? "" : "s"}.${omittedNote}
-${opts.heldAction} Review the bounded context shown here, then choose one path.${mentionNote}${heldHistory}
+${opts.heldAction} Review the bounded context shown here, then choose one path.${lineageNote}${mentionNote}${heldHistory}
 
 ` + (opts.draftInstructions ?? "") + continueAnyway;
 }
@@ -17436,27 +17559,39 @@ function buildAgentAppUrl(returnUrl, requestId) {
     return null;
   }
 }
+function pushServiceBlock(lines, service, active) {
+  lines.push(`- ${service.name}`);
+  lines.push(`  service: ${service.clientId}`);
+  lines.push(`  id: ${service.id}`);
+  if (service.appType === "slock_builtin") lines.push("  type: built-in Slock app");
+  lines.push(`  status: ${active ? "active login" : "not logged in"}`);
+  lines.push(`  return URL: ${formatMaybe(service.returnUrl)}`);
+  if (service.agentManifestUrl) {
+    lines.push(`  agent behavior manifest: ${service.agentManifestUrl}`);
+    lines.push(`  local CLI env: slock integration env --service ${JSON.stringify(service.clientId)}`);
+  }
+  if (service.homepageUrl) lines.push(`  homepage: ${service.homepageUrl}`);
+  if (service.description) lines.push(`  description: ${service.description}`);
+  if (!active) lines.push(`  next: slock integration login --service ${JSON.stringify(service.clientId)}`);
+}
 function formatIntegrationList(data) {
   const activeByServiceId = new Map(data.activeLogins.map((login) => [login.serviceId, login]));
+  const builtInServices = data.services.filter((service) => service.appType === "slock_builtin");
+  const registeredServices = data.services.filter((service) => service.appType !== "slock_builtin");
   const lines = [];
+  if (builtInServices.length > 0) {
+    lines.push("Built-in Slock apps:");
+    for (const service of builtInServices) {
+      pushServiceBlock(lines, service, activeByServiceId.get(service.id));
+    }
+    lines.push("");
+  }
   lines.push("Registered services:");
-  if (data.services.length === 0) {
+  if (registeredServices.length === 0) {
     lines.push("- none");
   } else {
-    for (const service of data.services) {
-      const active = activeByServiceId.get(service.id);
-      lines.push(`- ${service.name}`);
-      lines.push(`  service: ${service.clientId}`);
-      lines.push(`  id: ${service.id}`);
-      lines.push(`  status: ${active ? "active login" : "not logged in"}`);
-      lines.push(`  return URL: ${formatMaybe(service.returnUrl)}`);
-      if (service.agentManifestUrl) {
-        lines.push(`  agent behavior manifest: ${service.agentManifestUrl}`);
-        lines.push(`  local CLI env: slock integration env --service ${JSON.stringify(service.clientId)}`);
-      }
-      if (service.homepageUrl) lines.push(`  homepage: ${service.homepageUrl}`);
-      if (service.description) lines.push(`  description: ${service.description}`);
-      if (!active) lines.push(`  next: slock integration login --service ${JSON.stringify(service.clientId)}`);
+    for (const service of registeredServices) {
+      pushServiceBlock(lines, service, activeByServiceId.get(service.id));
     }
   }
   lines.push("");
@@ -17497,9 +17632,9 @@ function formatIntegrationLogin(data) {
   const agentAppUrl = buildAgentAppUrl(data.service.returnUrl, data.requestId);
   if (agentAppUrl) {
     lines.push(`app URL: ${agentAppUrl}`);
-    lines.push("next: open the app URL if you need the third-party app surface, or run `slock integration list` to confirm active login");
+    lines.push("next: open the app URL if you need the service app surface, or run `slock integration list` to confirm active login");
   } else {
-    lines.push("next: use the registered service, or run `slock integration list` to confirm active login");
+    lines.push("next: use the service, or run `slock integration list` to confirm active login");
   }
   return lines.join("\n");
 }
@@ -17508,7 +17643,7 @@ function formatIntegrationLogin(data) {
 var integrationListCommand = defineCommand(
   {
     name: "list",
-    description: "List registered third-party services and this agent's active logins",
+    description: "List built-in Slock apps, registered services, and this agent's active logins",
     options: [{ flags: "--json", description: "Emit machine-readable JSON" }]
   },
   async (ctx, opts) => {
@@ -17548,7 +17683,7 @@ function normalizeScopes(raw) {
 var integrationLoginCommand = defineCommand(
   {
     name: "login",
-    description: "Provision or reuse this agent's login for a registered service",
+    description: "Provision or reuse this agent's login for a built-in Slock app or registered service",
     options: [
       { flags: "--service <id>", description: "Registered service id, client id, or exact service name" },
       {

package/dist/core.js

@@ -9,10 +9,10 @@ import {
   resolveSlockCliPath,
   resolveWorkspaceDirectoryPath,
   scanWorkspaceDirectories
-} from "./chunk-QQRU3GA6.js";
+} from "./chunk-DLB2KVD7.js";
 import {
   subscribeDaemonLogs
-} from "./chunk-VOZJ2ELH.js";
+} from "./chunk-M2KQBJR3.js";
 export {
   DAEMON_CLI_USAGE,
   DaemonCore,

package/dist/index.js

@@ -3,8 +3,8 @@ import {
   DAEMON_CLI_USAGE,
   DaemonCore,
   parseDaemonCliArgs
-} from "./chunk-QQRU3GA6.js";
-import "./chunk-VOZJ2ELH.js";
+} from "./chunk-DLB2KVD7.js";
+import "./chunk-M2KQBJR3.js";
 
 // src/index.ts
 var parsedArgs = parseDaemonCliArgs(process.argv.slice(2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slock-ai/daemon",
-  "version": "0.55.2-alpha.0",
+  "version": "0.55.3",
   "type": "module",
   "bin": {
     "slock-daemon": "dist/index.js"