@agent-native/core 0.101.6 → 0.101.10

package/corpus/core/src/a2a/artifact-response.ts

@@ -1,3 +1,5 @@
+import { createHmac, timingSafeEqual } from "node:crypto";
+
 export interface A2AToolResultSummary {
   tool: string;
   result: string;
@@ -6,6 +8,121 @@ export interface A2AToolResultSummary {
 export interface A2AArtifactResponseOptions {
   baseUrl?: string;
   includeReferencedArtifacts?: boolean;
+  includePersistedArtifactMarker?: boolean;
+}
+
+export interface A2AArtifactIdentity {
+  resourceType:
+    | "document"
+    | "deck"
+    | "dashboard"
+    | "analysis"
+    | "image"
+    | "design"
+    | "monitor"
+    | "form";
+  id: string;
+  sourceAction: string;
+  titleAtAction?: string;
+  url?: string;
+}
+
+const ARTIFACT_IDENTITY_WRITE_TOOLS = new Set([
+  "save-monitor",
+  "create-form",
+  "submit-content-database-form",
+  "add-database-item",
+  "create-document",
+  "update-document",
+  "create-deck",
+  "duplicate-deck",
+  "add-slide",
+  "update-dashboard",
+  "rename-dashboard",
+  "save-analysis",
+  "generate-image",
+  "edit-image",
+  "refine-image",
+  "restyle-image",
+  "save-generated-image",
+  "save-generated-asset",
+  "export-image",
+  "export-asset",
+  "generate-image-batch",
+  "create-design",
+  "generate-design",
+  "create-file",
+  "duplicate-design",
+]);
+
+const PERSISTED_ARTIFACT_MARKER = "agent-native:persisted-artifacts=";
+const PERSISTED_ARTIFACT_MARKER_PATTERN =
+  /\s*<!--\s*agent-native:persisted-artifacts=[A-Za-z0-9_-]+\.[a-f0-9]{64}\s*-->/g;
+const ARTIFACT_RESOURCE_TYPES = new Set<A2AArtifactIdentity["resourceType"]>([
+  "document",
+  "deck",
+  "dashboard",
+  "analysis",
+  "image",
+  "design",
+  "monitor",
+  "form",
+]);
+
+function persistedArtifactIdentitiesFromMarker(
+  result: string,
+): A2AArtifactIdentity[] {
+  const secret = process.env.A2A_SECRET;
+  if (!secret) return [];
+  const match = result.match(
+    /<!--\s*agent-native:persisted-artifacts=([A-Za-z0-9_-]+)\.([a-f0-9]{64})\s*-->/,
+  );
+  if (!match) return [];
+  try {
+    const payload = match[1];
+    const expected = createHmac("sha256", secret).update(payload).digest();
+    const supplied = Buffer.from(match[2], "hex");
+    if (
+      supplied.length !== expected.length ||
+      !timingSafeEqual(supplied, expected)
+    ) {
+      return [];
+    }
+    const parsed = JSON.parse(Buffer.from(payload, "base64url").toString());
+    if (!Array.isArray(parsed)) return [];
+    return parsed
+      .slice(0, 12)
+      .filter((identity): identity is A2AArtifactIdentity => {
+        const item = asRecord(identity);
+        return (
+          !!item &&
+          ARTIFACT_RESOURCE_TYPES.has(
+            item.resourceType as A2AArtifactIdentity["resourceType"],
+          ) &&
+          typeof item.id === "string" &&
+          typeof item.sourceAction === "string"
+        );
+      });
+  } catch {
+    return [];
+  }
+}
+
+function withPersistedArtifactMarker(
+  text: string,
+  toolResults: A2AToolResultSummary[],
+): string {
+  const identities = extractA2AArtifactIdentities(toolResults).slice(0, 12);
+  const secret = process.env.A2A_SECRET;
+  if (identities.length === 0 || !secret) return text;
+  const payload = Buffer.from(JSON.stringify(identities)).toString("base64url");
+  const signature = createHmac("sha256", secret).update(payload).digest("hex");
+  const marker = `<!-- ${PERSISTED_ARTIFACT_MARKER}${payload}.${signature} -->`;
+  return text ? `${text}\n\n${marker}` : marker;
+}
+
+export function stripA2APersistedArtifactMarkers(text: string): string {
+  return text.replace(PERSISTED_ARTIFACT_MARKER_PATTERN, "").trim();
 }
 
 interface CreatedDocumentArtifact {
@@ -617,15 +734,25 @@ function collectArtifacts(results: A2AToolResultSummary[]): {
 
     if (
       toolResult.tool === "generate-image" ||
+      toolResult.tool === "edit-image" ||
       toolResult.tool === "refine-image" ||
+      toolResult.tool === "restyle-image" ||
       toolResult.tool === "get-asset" ||
       toolResult.tool === "save-generated-image" ||
+      toolResult.tool === "save-generated-asset" ||
       toolResult.tool === "export-image"
     ) {
       addImageArtifact(images, parsed);
       continue;
     }
 
+    if (toolResult.tool === "export-asset") {
+      if (stringValue(parsed.artifactType) === "image") {
+        addImageArtifact(images, parsed);
+      }
+      continue;
+    }
+
     if (toolResult.tool === "generate-image-batch") {
       if (Array.isArray(parsed.images)) {
         for (const item of parsed.images) {
@@ -730,6 +857,114 @@ function collectArtifacts(results: A2AToolResultSummary[]): {
   };
 }
 
+/**
+ * Extract a compact, verified identity ledger from successful artifact tools.
+ * The ledger deliberately excludes raw tool results so it is safe to retain in
+ * long-lived thread context and stable even when a resource is later renamed.
+ */
+export function extractA2AArtifactIdentities(
+  results: A2AToolResultSummary[],
+): A2AArtifactIdentity[] {
+  const identities = new Map<string, A2AArtifactIdentity>();
+
+  const remember = (identity: A2AArtifactIdentity) => {
+    identities.set(`${identity.resourceType}:${identity.id}`, identity);
+  };
+
+  for (const result of results) {
+    if (result.tool === "call-agent") {
+      for (const identity of persistedArtifactIdentitiesFromMarker(
+        result.result,
+      )) {
+        remember({ ...identity, sourceAction: "call-agent" });
+      }
+      continue;
+    }
+    if (!ARTIFACT_IDENTITY_WRITE_TOOLS.has(result.tool)) continue;
+    const artifacts = collectArtifacts([result]);
+    for (const document of artifacts.documents) {
+      remember({
+        resourceType: "document",
+        id: document.id,
+        sourceAction: result.tool,
+        titleAtAction: document.title,
+        url: document.url,
+      });
+    }
+    for (const deck of artifacts.decks) {
+      remember({
+        resourceType: "deck",
+        id: deck.id,
+        sourceAction: result.tool,
+        url: deck.url,
+      });
+    }
+    for (const dashboard of artifacts.dashboards) {
+      remember({
+        resourceType: "dashboard",
+        id: dashboard.id,
+        sourceAction: result.tool,
+        titleAtAction: dashboard.title,
+        url: dashboard.url,
+      });
+    }
+    for (const analysis of artifacts.analyses) {
+      remember({
+        resourceType: "analysis",
+        id: analysis.id,
+        sourceAction: result.tool,
+        titleAtAction: analysis.title,
+        url: analysis.url,
+      });
+    }
+    for (const image of artifacts.images) {
+      remember({
+        resourceType: "image",
+        id: image.id,
+        sourceAction: result.tool,
+        titleAtAction: image.title,
+        url: image.url,
+      });
+    }
+    for (const design of artifacts.designShells) {
+      remember({
+        resourceType: "design",
+        id: design.id,
+        sourceAction: result.tool,
+        titleAtAction: design.title,
+      });
+    }
+    for (const design of artifacts.generatedDesigns) {
+      remember({
+        resourceType: "design",
+        id: design.id,
+        sourceAction: result.tool,
+        url: design.url,
+      });
+    }
+    for (const monitor of artifacts.monitors) {
+      remember({
+        resourceType: "monitor",
+        id: monitor.id,
+        sourceAction: result.tool,
+        titleAtAction: monitor.name,
+        url: monitor.url,
+      });
+    }
+    for (const form of artifacts.forms) {
+      remember({
+        resourceType: "form",
+        id: form.id,
+        sourceAction: result.tool,
+        titleAtAction: form.title,
+        url: form.url,
+      });
+    }
+  }
+
+  return [...identities.values()];
+}
+
 type DownstreamArtifact =
   | { kind: "deck"; id: string; url: string }
   | { kind: "document"; id: string; url: string; title?: string }
@@ -1131,6 +1366,10 @@ export function appendA2AArtifactLinks(
   const baseUrl = normalizeBaseUrl(options.baseUrl);
   const includeReferencedArtifacts =
     options.includeReferencedArtifacts ?? false;
+  const finalize = (value: string) =>
+    options.includePersistedArtifactMarker
+      ? withPersistedArtifactMarker(value, toolResults)
+      : value;
   const {
     documents,
     decks,
@@ -1160,7 +1399,7 @@ export function appendA2AArtifactLinks(
     ) ||
       /\b(?:done|created|ready|here(?:'s| is)|complete|finished)\b/i.test(text))
   ) {
-    return formatIncompleteDesignMessage(incompleteShells);
+    return finalize(formatIncompleteDesignMessage(incompleteShells));
   }
 
   const unverifiedRefs = findUnverifiedArtifactReferences(
@@ -1174,15 +1413,17 @@ export function appendA2AArtifactLinks(
     generatedDesigns,
   );
   if (unverifiedRefs.length > 0) {
-    return formatUnverifiedArtifactMessage(
-      unverifiedRefs,
-      documents,
-      decks,
-      dashboards,
-      analyses,
-      images,
-      generatedDesigns,
-      baseUrl,
+    return finalize(
+      formatUnverifiedArtifactMessage(
+        unverifiedRefs,
+        documents,
+        decks,
+        dashboards,
+        analyses,
+        images,
+        generatedDesigns,
+        baseUrl,
+      ),
     );
   }
 
@@ -1258,9 +1499,11 @@ export function appendA2AArtifactLinks(
     }
   }
 
-  if (missingLines.length === 0) return text;
+  if (missingLines.length === 0) {
+    return finalize(text);
+  }
   const artifactBlock = `Artifacts:\n${missingLines.join("\n")}`;
-  return text ? `${text}\n\n${artifactBlock}` : artifactBlock;
+  return finalize(text ? `${text}\n\n${artifactBlock}` : artifactBlock);
 }
 
 export function buildA2ARecoverableArtifactMessage(

package/corpus/core/src/agent/thread-data-builder.ts

@@ -637,23 +637,96 @@ export function threadDataToEngineMessages(
   for (const entry of data.messages) {
     const m = entry?.message ?? entry;
     if (!m || (m.role !== "user" && m.role !== "assistant")) continue;
-    const text =
-      typeof m.content === "string"
-        ? m.content
-        : Array.isArray(m.content)
-          ? m.content
-              .filter(
-                (c: any) => c?.type === "text" && typeof c.text === "string",
-              )
-              .map((c: any) => c.text)
-              .join("\n")
-          : "";
+    const text = threadMessageTextForEngine(m);
     if (!text.trim()) continue;
     messages.push({ role: m.role, content: [{ type: "text", text }] });
   }
   return messages;
 }
 
+const MAX_INTEGRATION_ARTIFACTS_IN_CONTEXT = 12;
+const MAX_INTEGRATION_ARTIFACT_FIELD_CHARS = 500;
+
+function boundedString(value: unknown): string | undefined {
+  if (typeof value !== "string") return undefined;
+  const trimmed = value.trim();
+  return trimmed
+    ? trimmed.slice(0, MAX_INTEGRATION_ARTIFACT_FIELD_CHARS)
+    : undefined;
+}
+
+function promptSafeJson(value: unknown): string {
+  return JSON.stringify(value)
+    .replaceAll("&", "\\u0026")
+    .replaceAll("<", "\\u003c")
+    .replaceAll(">", "\\u003e");
+}
+
+function messageTextContent(message: any): string {
+  if (typeof message?.content === "string") return message.content;
+  if (!Array.isArray(message?.content)) return "";
+  return message.content
+    .filter(
+      (part: any) => part?.type === "text" && typeof part.text === "string",
+    )
+    .map((part: any) => part.text)
+    .join("\n");
+}
+
+/**
+ * Select the participant-visible delivery for integration turns while keeping
+ * a compact, trusted resource ledger available to the agent. Raw tool results
+ * remain in thread_data for UI/audit use but are not replayed into the prompt.
+ */
+export function threadMessageTextForEngine(message: any): string {
+  const delivery = message?.metadata?.integrationDelivery;
+  const deliveryAttempted =
+    message?.metadata?.integrationDeliveryAttempted === true;
+  const deliveredText =
+    message?.role === "assistant" &&
+    delivery?.status === "delivered" &&
+    typeof delivery.text === "string" &&
+    delivery.text.trim()
+      ? delivery.text
+      : undefined;
+  let text =
+    deliveredText ??
+    (message?.role === "assistant" && deliveryAttempted
+      ? ""
+      : messageTextContent(message));
+
+  if (message?.role !== "assistant") return text;
+  const storedArtifacts = message?.metadata?.integrationArtifacts;
+  if (!Array.isArray(storedArtifacts)) return text;
+
+  const artifacts = storedArtifacts
+    .slice(0, MAX_INTEGRATION_ARTIFACTS_IN_CONTEXT)
+    .map((artifact: any) => ({
+      resourceType: boundedString(artifact?.resourceType),
+      id: boundedString(artifact?.id),
+      sourceAction: boundedString(artifact?.sourceAction),
+      titleAtAction: boundedString(artifact?.titleAtAction),
+      url: boundedString(artifact?.url),
+    }))
+    .filter(
+      (artifact: {
+        resourceType?: string;
+        id?: string;
+        sourceAction?: string;
+      }) => artifact.resourceType && artifact.id && artifact.sourceAction,
+    );
+  if (artifacts.length === 0) return text;
+
+  const context = [
+    "<integration_artifact_context>",
+    "Trusted action history for this conversation. Resource IDs remain stable if participants rename the resource. Use these IDs when a follow-up refers to an earlier artifact, while still deciding from the request whether to update, add, supersede, or create.",
+    promptSafeJson(artifacts),
+    "</integration_artifact_context>",
+  ].join("\n");
+  text = text.trim() ? `${text.trim()}\n\n${context}` : context;
+  return text;
+}
+
 export interface CodeAgentThreadTranscriptEvent {
   id: string;
   runId: string;

package/corpus/core/src/client/review/ReviewCommentComposer.tsx

@@ -1,7 +1,7 @@
 import { Button } from "@agent-native/toolkit/ui/button";
 import { Spinner } from "@agent-native/toolkit/ui/spinner";
 import { Textarea } from "@agent-native/toolkit/ui/textarea";
-import { IconMessageCircle, IconSend } from "@tabler/icons-react";
+import { IconFocus2, IconMessageCircle, IconSend } from "@tabler/icons-react";
 
 import type { ReviewResolutionTarget } from "../../review/types.js";
 import { cn } from "../utils.js";
@@ -16,6 +16,7 @@ export interface ReviewCommentComposerProps {
   placeholder?: string;
   commentLabel?: string;
   agentLabel?: string;
+  contextLabel?: string;
   autoFocus?: boolean;
   submitOnEnter?: boolean;
   onEscape?: () => void;
@@ -32,6 +33,7 @@ export function ReviewCommentComposer({
   placeholder = "Add a comment...",
   commentLabel = "Comment",
   agentLabel = "Send to agent",
+  contextLabel,
   autoFocus = false,
   submitOnEnter = false,
   onEscape,
@@ -51,6 +53,12 @@ export function ReviewCommentComposer({
         submit("human");
       }}
     >
+      {contextLabel ? (
+        <div className="mb-2 flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground">
+          <IconFocus2 className="size-3.5 shrink-0" />
+          <span className="truncate">{contextLabel}</span>
+        </div>
+      ) : null}
       <Textarea
         autoFocus={autoFocus}
         value={value}

package/corpus/core/src/client/review/ReviewThreadPanel.tsx

@@ -52,6 +52,14 @@ export interface ReviewThreadPanelProps {
   resourceType: string;
   resourceId: string;
   targetId?: string | null;
+  /** Persist new comments against this target while targetId continues to filter the list. */
+  composerTargetId?: string | null;
+  /** Optional element/point anchor attached to new comments from the composer. */
+  composerAnchor?: unknown | null;
+  /** Host metadata attached to new comments from the composer. */
+  composerMetadata?: Record<string, unknown>;
+  /** Visible label describing the element currently targeted by the composer. */
+  composerContextLabel?: string;
   title?: string;
   className?: string;
   includeResolved?: boolean;
@@ -89,6 +97,10 @@ export function ReviewThreadPanel({
   resourceType,
   resourceId,
   targetId,
+  composerTargetId,
+  composerAnchor,
+  composerMetadata,
+  composerContextLabel,
   title = "Review",
   className,
   includeResolved = true,
@@ -145,9 +157,11 @@ export function ReviewThreadPanel({
       {
         resourceType,
         resourceId,
-        targetId,
+        targetId: composerTargetId === undefined ? targetId : composerTargetId,
+        ...(composerAnchor !== undefined ? { anchor: composerAnchor } : {}),
+        ...(composerMetadata ? { metadata: composerMetadata } : {}),
         body,
-        ...(showComposerTargetPicker ? { resolutionTarget } : {}),
+        resolutionTarget: showComposerTargetPicker ? resolutionTarget : "human",
       },
       {
         onSuccess: (comment) => {
@@ -194,6 +208,7 @@ export function ReviewThreadPanel({
           placeholder={placeholder}
           commentLabel={composerCommentLabel}
           agentLabel={composerAgentLabel}
+          contextLabel={composerContextLabel}
         />
       ) : null}
 

package/corpus/core/src/client/settings/SettingsPanel.tsx

@@ -45,6 +45,7 @@ import {
   TooltipTrigger,
 } from "../components/ui/tooltip.js";
 import { TeamPage } from "../org/TeamPage.js";
+import { BuilderConnectCard } from "../setup-connections/BuilderConnectCard.js";
 import { callAction } from "../use-action.js";
 import { uploadAvatar, useAvatarUrl } from "../use-avatar.js";
 import { useDevMode } from "../use-dev-mode.js";
@@ -2578,6 +2579,7 @@ interface SettingsPanelContentProps extends SettingsPanelProps {
   showCapabilityStrip?: boolean;
   className?: string;
   surface?: SettingsSurface;
+  builderConnectionOwnedExternally?: boolean;
 }
 
 function SettingsPanelContent({
@@ -2591,8 +2593,11 @@ function SettingsPanelContent({
   showCapabilityStrip = true,
   className,
   surface = "sidebar",
+  builderConnectionOwnedExternally = false,
 }: SettingsPanelContentProps) {
-  const { status: builder, loading: builderLoading } = useBuilderStatus();
+  const { status: builder, loading: builderLoading } = useBuilderStatus({
+    enabled: !builderConnectionOwnedExternally,
+  });
   const connected = builder?.configured ?? false;
   const connectUrl = builder?.cliAuthUrl ?? builder?.connectUrl;
   const orgName = builder?.orgName;
@@ -2600,6 +2605,7 @@ function SettingsPanelContent({
   const credentialSource = builder?.credentialSource;
   const builderBranchesAvailable = !!builder?.builderEnabled;
   const builderFlow = useBuilderConnectFlow({
+    enabled: !builderConnectionOwnedExternally,
     popupUrl: connectUrl,
     trackingSource: "settings_panel_builder_card",
   });
@@ -2965,20 +2971,22 @@ function SettingsPanelContent({
             icon={<IconBrowser size={14} />}
             title="Browser Automation"
             subtitle="Let agents control a real browser for web tasks."
-            connected={connected}
+            connected={builderConnectionOwnedExternally ? undefined : connected}
             open={openSection === "browser"}
             onToggle={() => toggle("browser")}
           >
-            <UseBuilderCard
-              builderFlow={builderFlow}
-              connectUrl={connectUrl}
-              connected={connected}
-              orgName={orgName}
-              envManaged={envManaged}
-              credentialSource={credentialSource}
-              trackingSource="browser_settings"
-              trackingFlow="browser_automation"
-            />
+            {!builderConnectionOwnedExternally ? (
+              <UseBuilderCard
+                builderFlow={builderFlow}
+                connectUrl={connectUrl}
+                connected={connected}
+                orgName={orgName}
+                envManaged={envManaged}
+                credentialSource={credentialSource}
+                trackingSource="browser_settings"
+                trackingFlow="browser_automation"
+              />
+            ) : null}
           </SettingsSection>
         )}
 
@@ -3057,6 +3065,26 @@ export function SettingsPanel(props: SettingsPanelProps) {
   return <SettingsPanelContent {...props} />;
 }
 
+export function ConnectionsSettingsContent({
+  settingsPanelProps,
+}: {
+  settingsPanelProps: SettingsPanelProps;
+}) {
+  return (
+    <div className="mx-auto w-full max-w-2xl space-y-4">
+      <BuilderConnectCard trackingSource="settings_connections" />
+      <SettingsPanelContent
+        {...settingsPanelProps}
+        surface="page"
+        sections={CONNECTION_SETTINGS_SECTIONS}
+        showCapabilityStrip={false}
+        className="w-full"
+        builderConnectionOwnedExternally
+      />
+    </div>
+  );
+}
+
 export function useAgentSettingsTabs(): SettingsTabItem[] {
   const { isDevMode, canToggle, setDevMode } = useDevMode();
   const baseProps = useMemo<SettingsPanelProps>(
@@ -3102,15 +3130,7 @@ export function useAgentSettingsTabs(): SettingsTabItem[] {
         ...connections,
         icon: IconPlugConnected,
         group: "agent",
-        content: (
-          <SettingsPanelContent
-            {...baseProps}
-            surface="page"
-            sections={CONNECTION_SETTINGS_SECTIONS}
-            showCapabilityStrip={false}
-            className="mx-auto w-full max-w-2xl"
-          />
-        ),
+        content: <ConnectionsSettingsContent settingsPanelProps={baseProps} />,
       },
       {
         ...organization,