@jskit-ai/assistant-runtime 0.1.234 → 0.1.236

package/src/server/createAssistantSettingsActions.js

@@ -46,10 +46,6 @@ function createAssistantSettingsActions({ assistantConfigService, settingsSurfac
       }
     },
     idempotency: "none",
-    audit: {
-      actionName: actionIds.settingsRead
-    },
-    observability: {},
     async execute(input, context) {
       return returnJsonApiData(await assistantConfigService.getSettings(input, {
         context
@@ -73,10 +69,6 @@ function createAssistantSettingsActions({ assistantConfigService, settingsSurfac
       }
     },
     idempotency: "optional",
-    audit: {
-      actionName: actionIds.settingsUpdate
-    },
-    observability: {},
     async execute(input, context) {
       return returnJsonApiData(await assistantConfigService.updateSettings(input, input.patch, {
         context

package/src/server/inputSchemas.js

@@ -1,6 +1,7 @@
 import { createSchema } from "json-rest-schema";
 import { deepFreeze } from "@jskit-ai/kernel/shared/support/deepFreeze";
 import { composeSchemaDefinitions } from "@jskit-ai/kernel/shared/validators";
+import { attachmentIdsField } from "@jskit-ai/assistant-core/shared";
 
 const assistantSurfaceRouteParamsSchema = createSchema({
   surfaceId: {
@@ -65,10 +66,7 @@ const assistantConversationSendBodyValidator = deepFreeze({
   schema: createSchema({
     messageId: { type: "string", required: true, minLength: 1, maxLength: 128 },
     text: { type: "string", required: true },
-    attachmentIds: {
-      type: "array", required: false, maxItems: 10,
-      items: { type: "string", minLength: 1, maxLength: 256 }
-    },
+    attachmentIds: attachmentIdsField,
     steer: { type: "boolean", required: false }
   }),
   mode: "patch"
@@ -111,10 +109,7 @@ const assistantConversationGoalBodyValidator = deepFreeze({
     messageId: { type: "string", required: false, minLength: 1, maxLength: 128 },
     objective: { type: "string", required: false, minLength: 1, maxLength: 4000 },
     tokenBudget: { type: "integer", required: false, nullable: true, min: 1, max: Number.MAX_SAFE_INTEGER },
-    attachmentIds: {
-      type: "array", required: false, maxItems: 10,
-      items: { type: "string", minLength: 1, maxLength: 256 }
-    }
+    attachmentIds: attachmentIdsField
   }),
   mode: "replace"
 });

package/src/server/registerConversationSubscriptions.js

@@ -3,7 +3,8 @@ import { attachDirectRequestActionExecutor } from "@jskit-ai/kernel/server/http"
 import { AppError } from "@jskit-ai/kernel/server/runtime";
 import { actionIds } from "./actionIds.js";
 import { resolveRouteRequestState } from "./support/assistantRouteContext.js";
-import { resolveAssistantSurfaceConfig } from "../shared/assistantSurfaces.js";
+import { errorStatus } from "./support/assistantErrors.js";
+import { requireAssistantSurface } from "./support/assistantSurface.js";
 import {
   ASSISTANT_CONVERSATION_EVENT,
   ASSISTANT_CONVERSATION_SUBSCRIBE,
@@ -18,7 +19,7 @@ function requireSubscriptionId(input) {
 }
 
 function subscriptionError(error) {
-  const status = Number(error?.status || error?.statusCode || 500);
+  const status = errorStatus(error);
   return {
     ok: false,
     error: status < 500 ? String(error.message || "Conversation subscription failed.") : "Conversation subscription failed.",
@@ -69,14 +70,16 @@ function registerConversationSubscriptions({ realtime, events, actions, config =
       let stage = "request-admission";
       let observedConversationId;
       let diagnosticTimer;
+      function stageRecord(stageName, fields, now) {
+        return { event: "assistant.conversation.subscription", subscriptionEpoch: subscription?.epoch,
+          ...(typeof observedConversationId === "string" ? { conversationId: observedConversationId } : {}),
+          stage: stageName, previousStage: stage, durationMs: now - stageStartedAt, elapsedMs: now - startedAt, ...fields };
+      }
       function diagnostic(stageName, fields = {}) {
         if (!diagnostics) return;
         const now = performance.now();
         try {
-          logger?.warn?.({ event: "assistant.conversation.subscription", subscriptionEpoch: subscription?.epoch,
-            ...(typeof observedConversationId === "string" ? { conversationId: observedConversationId } : {}),
-            stage: stageName, previousStage: stage, durationMs: now - stageStartedAt,
-            elapsedMs: now - startedAt, ...fields }, "Assistant conversation subscription diagnostic.");
+          logger?.warn?.(stageRecord(stageName, fields, now), "Assistant conversation subscription diagnostic.");
         } catch { /* Diagnostics never change admission or cleanup. */ }
       }
       function onStage(next, fields = {}) {
@@ -86,11 +89,7 @@ function registerConversationSubscriptions({ realtime, events, actions, config =
         try {
           const slowOutcome = now - startedAt >= 5_000 && ["acknowledgement", "abandoned"].includes(next);
           const level = diagnostics || next === "failed" || slowOutcome ? "warn" : "info";
-          logger?.[level]?.({ event: "assistant.conversation.subscription", subscriptionEpoch: subscription?.epoch,
-            ...(typeof observedConversationId === "string" ? { conversationId: observedConversationId } : {}),
-            stage: next, previousStage: stage,
-            durationMs: now - stageStartedAt, elapsedMs: now - startedAt, ...fields },
-          "Assistant conversation subscription stage");
+          logger?.[level]?.(stageRecord(next, fields, now), "Assistant conversation subscription stage");
         } catch { /* Diagnostics must not change conversation admission or cleanup. */ }
         stage = next;
         stageStartedAt = now;
@@ -113,8 +112,7 @@ function registerConversationSubscriptions({ realtime, events, actions, config =
         const request = await (requestPolicy === "host" ? readRequest() : authenticate());
         if (!current()) { onStage("abandoned"); return; }
         onStage("action-admission");
-        const assistantSurface = resolveAssistantSurfaceConfig(config, input.targetSurfaceId);
-        if (!assistantSurface) throw new AppError(404, "Assistant not found.");
+        const assistantSurface = requireAssistantSurface(config, input.targetSurfaceId);
         const requiresWorkspace = assistantSurface.runtimeSurfaceRequiresWorkspace;
         request.headers = { ...request.headers, "x-jskit-surface": input.hostSurfaceId };
         request.input = { params: {
@@ -155,7 +153,7 @@ function registerConversationSubscriptions({ realtime, events, actions, config =
         function onEvent(event) {
           if (!current()) return;
           const revision = ++subscription.revision;
-          // The Colleague publisher already coalesces transient full-text replies.
+          // Conversation runtimes publish full-text in-progress replies; only the latest per message needs delivery.
           if (event.type === "message" && event.status === "inProgress") {
             subscription.pending.set(event.messageId, { event, revision });
             subscription.timer ||= setTimeout(flush, 25);
@@ -187,7 +185,7 @@ function registerConversationSubscriptions({ realtime, events, actions, config =
         onStage("acknowledgement-sent");
       } catch (error) {
         onStage("failed", { code: String(error?.code || "assistant_subscription_failed"),
-          status: Number(error?.status || error?.statusCode || 500) });
+          status: errorStatus(error) });
         if (subscriptions.get(subscriptionId) === subscription) release(subscriptionId);
         if (!closed && socket.connected) acknowledge(subscriptionError(error));
       } finally {

package/src/server/registerRoutes.js

@@ -27,14 +27,12 @@ import {
   assistantSurfaceRouteParamsValidator
 } from "./inputSchemas.js";
 import { registerSettingsRoutes } from "./registerSettingsRoutes.js";
+import { errorStatus, exposedAppErrorDetails } from "./support/assistantErrors.js";
+import { ASSISTANT_STREAM_WRITER_METHODS } from "./support/assistantStreamWriter.js";
 import { requireWorkspaceAssistantRouteParams, resolveRouteRequestState } from "./support/assistantRouteContext.js";
 
-function shouldExposeAppErrorDetails(errorCode = "") {
-  return String(errorCode || "").trim() !== "ACTION_PERMISSION_DENIED";
-}
-
 function sendPreStreamErrorResponse(reply, error) {
-  const statusCode = Number(error?.status || error?.statusCode || 500);
+  const statusCode = errorStatus(error);
   const safeStatusCode = Number.isInteger(statusCode) && statusCode >= 400 && statusCode <= 599 ? statusCode : 500;
 
   if (error instanceof AppError) {
@@ -44,10 +42,11 @@ function sendPreStreamErrorResponse(reply, error) {
       code: appErrorCode
     };
 
-    if (error.details && shouldExposeAppErrorDetails(appErrorCode)) {
-      payload.details = error.details;
-      if (error.details.fieldErrors) {
-        payload.fieldErrors = error.details.fieldErrors;
+    const details = exposedAppErrorDetails(error);
+    if (details) {
+      payload.details = details;
+      if (details.fieldErrors) {
+        payload.fieldErrors = details.fieldErrors;
       }
     }
 
@@ -156,36 +155,13 @@ function registerRuntimeRoutes(
         streamStarted = true;
       }
 
-      const streamWriter = Object.freeze({
-        sendMeta(payload = {}) {
-          ensureStreamStarted();
-          writeNdjson(reply, payload);
-        },
-        sendAssistantDelta(payload = {}) {
-          ensureStreamStarted();
-          writeNdjson(reply, payload);
-        },
-        sendAssistantMessage(payload = {}) {
-          ensureStreamStarted();
-          writeNdjson(reply, payload);
-        },
-        sendToolCall(payload = {}) {
-          ensureStreamStarted();
-          writeNdjson(reply, payload);
-        },
-        sendToolResult(payload = {}) {
-          ensureStreamStarted();
-          writeNdjson(reply, payload);
-        },
-        sendError(payload = {}) {
-          ensureStreamStarted();
-          writeNdjson(reply, payload);
-        },
-        sendDone(payload = {}) {
-          ensureStreamStarted();
-          writeNdjson(reply, payload);
-        }
-      });
+      function sendStreamEvent(payload = {}) {
+        ensureStreamStarted();
+        writeNdjson(reply, payload);
+      }
+      const streamWriter = Object.freeze(
+        Object.fromEntries(ASSISTANT_STREAM_WRITER_METHODS.map(name => [name, sendStreamEvent]))
+      );
 
       try {
         request.raw.on("close", closeListener);

package/src/server/repositories/conversationsRepository.js

@@ -1,25 +1,17 @@
 import { applyForUpdate, createWithTransaction, normalizeDbRecordId, runInTransaction } from "@jskit-ai/database-runtime/shared/repositoryOptions";
 import { normalizeSurfaceId } from "@jskit-ai/kernel/shared/surface/registry";
-import { normalizeRecordId, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
+import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 import {
+  applyWorkspaceScope,
+  normalizeDbWorkspaceId,
+  normalizeInputRecordId,
+  normalizeWorkspaceId,
   parseJsonObject,
   resolveInsertedId,
   stringifyJsonObject,
   toIso
 } from "./repositoryPersistenceUtils.js";
-import { assistantRuntimeConfig } from "../../shared/assistantRuntimeConfig.js";
-
-function normalizeWorkspaceId(value) {
-  return normalizeRecordId(value, { fallback: null });
-}
-
-function normalizeDbWorkspaceId(value) {
-  return normalizeDbRecordId(value, { fallback: null });
-}
-
-function normalizeInputRecordId(value) {
-  return normalizeRecordId(value, { fallback: null });
-}
+import { DEFAULT_CONVERSATION_TITLE, assistantRuntimeConfig } from "../../shared/assistantRuntimeConfig.js";
 
 function normalizeRequiredSurfaceId(value) {
   const normalizedSurfaceId = normalizeSurfaceId(value);
@@ -30,20 +22,11 @@ function normalizeRequiredSurfaceId(value) {
   return normalizedSurfaceId;
 }
 
-function applyWorkspaceScope(query, columnName, workspaceId) {
-  const normalizedWorkspaceId = normalizeWorkspaceId(workspaceId);
-  if (normalizedWorkspaceId) {
-    return query.where(columnName, normalizedWorkspaceId);
-  }
-
-  return query.whereNull(columnName);
-}
-
 function mapConversationRow(row = {}) {
   return {
     id: normalizeDbRecordId(row.id, { fallback: "" }),
     workspaceId: normalizeDbWorkspaceId(row.workspace_id),
-    title: String(row.title || "New conversation"),
+    title: String(row.title || DEFAULT_CONVERSATION_TITLE),
     createdByUserId: row.created_by_user_id == null ? null : normalizeDbRecordId(row.created_by_user_id, { fallback: null }),
     status: String(row.status || "active"),
     provider: String(row.provider || ""),
@@ -132,7 +115,7 @@ function createRepository(knex) {
     const insertResult = await client(assistantRuntimeConfig.conversationsTable).insert({
       workspace_id: normalizeWorkspaceId(payload.workspaceId),
       created_by_user_id: normalizeInputRecordId(payload.createdByUserId),
-      title: normalizeText(payload.title) || "New conversation",
+      title: normalizeText(payload.title) || DEFAULT_CONVERSATION_TITLE,
       status: normalizeText(payload.status).toLowerCase() || "active",
       provider: normalizeText(payload.provider),
       model: normalizeText(payload.model),
@@ -164,7 +147,7 @@ function createRepository(knex) {
     const updatePatch = {};
 
     if (Object.hasOwn(patch, "title")) {
-      updatePatch.title = normalizeText(patch.title) || "New conversation";
+      updatePatch.title = normalizeText(patch.title) || DEFAULT_CONVERSATION_TITLE;
     }
     if (Object.hasOwn(patch, "status")) {
       updatePatch.status = normalizeText(patch.status).toLowerCase() || "active";
@@ -200,26 +183,6 @@ function createRepository(knex) {
     });
   }
 
-  async function incrementMessageCount(conversationId, delta = 1, options = {}) {
-    const normalizedConversationId = normalizeInputRecordId(conversationId);
-    if (!normalizedConversationId) {
-      return null;
-    }
-
-    const client = options?.trx || knex;
-    const incrementBy = Number.isInteger(Number(delta)) ? Number(delta) : 1;
-    await client(assistantRuntimeConfig.conversationsTable)
-      .where({ id: normalizedConversationId })
-      .update({
-        message_count: client.raw("GREATEST(0, message_count + ?)", [incrementBy]),
-        updated_at: new Date()
-      });
-
-    return findById(normalizedConversationId, {
-      trx: client
-    });
-  }
-
   async function listForActorScope(
     { workspaceId = null, actorUserId = null, surfaceId = "", pagination = {}, filters = {} } = {},
     options = {}
@@ -275,7 +238,6 @@ function createRepository(knex) {
     findByIdForActorScope,
     create,
     updateById,
-    incrementMessageCount,
     listForActorScope,
     transaction
   });

package/src/server/repositories/messagesRepository.js

@@ -1,6 +1,10 @@
 import { createWithTransaction, normalizeDbRecordId, runInTransaction } from "@jskit-ai/database-runtime/shared/repositoryOptions";
-import { normalizeRecordId, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
+import { normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 import {
+  applyWorkspaceScope,
+  normalizeDbWorkspaceId,
+  normalizeInputRecordId,
+  normalizeWorkspaceId,
   parseJsonObject,
   resolveInsertedId,
   stringifyJsonObject,
@@ -8,27 +12,6 @@ import {
 } from "./repositoryPersistenceUtils.js";
 import { assistantRuntimeConfig } from "../../shared/assistantRuntimeConfig.js";
 
-function normalizeWorkspaceId(value) {
-  return normalizeRecordId(value, { fallback: null });
-}
-
-function normalizeDbWorkspaceId(value) {
-  return normalizeDbRecordId(value, { fallback: null });
-}
-
-function normalizeInputRecordId(value) {
-  return normalizeRecordId(value, { fallback: null });
-}
-
-function applyWorkspaceScope(query, columnName, workspaceId) {
-  const normalizedWorkspaceId = normalizeWorkspaceId(workspaceId);
-  if (normalizedWorkspaceId) {
-    return query.where(columnName, normalizedWorkspaceId);
-  }
-
-  return query.whereNull(columnName);
-}
-
 function mapMessageRow(row = {}) {
   return {
     id: normalizeDbRecordId(row.id, { fallback: "" }),

package/src/server/repositories/repositoryPersistenceUtils.js

@@ -1,6 +1,30 @@
 import { resolveInsertedRecordId } from "@jskit-ai/database-runtime/shared";
+import { normalizeDbRecordId } from "@jskit-ai/database-runtime/shared/repositoryOptions";
+import { normalizeRecordId } from "@jskit-ai/kernel/shared/support/normalize";
 import { parseJsonObject } from "@jskit-ai/assistant-core/shared";
 
+function normalizeWorkspaceId(value) {
+  return normalizeRecordId(value, { fallback: null });
+}
+
+function normalizeDbWorkspaceId(value) {
+  return normalizeDbRecordId(value, { fallback: null });
+}
+
+function normalizeInputRecordId(value) {
+  return normalizeRecordId(value, { fallback: null });
+}
+
+function applyWorkspaceScope(query, columnName, workspaceId) {
+  const normalizedWorkspaceId = normalizeWorkspaceId(workspaceId);
+  if (normalizedWorkspaceId) {
+    return query.where(columnName, normalizedWorkspaceId);
+  }
+
+  return query.whereNull(columnName);
+}
+
+
 function stringifyJsonObject(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
     return null;
@@ -26,4 +50,13 @@ function resolveInsertedId(insertResult) {
   return resolveInsertedRecordId(insertResult, { fallback: "" }) || "";
 }
 
-export { parseJsonObject, stringifyJsonObject, toIso, resolveInsertedId };
+export {
+  applyWorkspaceScope,
+  normalizeDbWorkspaceId,
+  normalizeInputRecordId,
+  normalizeWorkspaceId,
+  parseJsonObject,
+  stringifyJsonObject,
+  toIso,
+  resolveInsertedId
+};

package/src/server/services/assistantConfigService.js

@@ -1,12 +1,11 @@
 import { AppError, requireAuth } from "@jskit-ai/kernel/server/runtime";
 import { normalizeObject, normalizeRecordId } from "@jskit-ai/kernel/shared/support/normalize";
-import { resolveAssistantSurfaceConfig } from "../../shared/assistantSurfaces.js";
+import { requireAssistantSurface } from "../support/assistantSurface.js";
 
 function createService({
   assistantConfigRepository,
   consoleService = null,
   appConfig = {},
-  resolveAppConfig = null,
   workspaceScopeSupport = null
 } = {}) {
   if (!assistantConfigRepository || typeof assistantConfigRepository.findByScope !== "function") {
@@ -19,18 +18,6 @@ function createService({
     throw new Error("assistantConfigService requires assistantConfigRepository.createDefaultRecord().");
   }
 
-  const resolveCurrentAppConfig =
-    typeof resolveAppConfig === "function" ? resolveAppConfig : () => appConfig;
-
-  function requireAssistantSurface(targetSurfaceId = "") {
-    const assistantSurface = resolveAssistantSurfaceConfig(resolveCurrentAppConfig(), targetSurfaceId);
-    if (assistantSurface) {
-      return assistantSurface;
-    }
-
-    throw new AppError(404, "Assistant not found.");
-  }
-
   async function requireSettingsAccess(assistantSurface, context = {}, { mode = "read" } = {}) {
     requireAuth({ context }, {
       require: "authenticated"
@@ -82,7 +69,7 @@ function createService({
   }
 
   async function getSettings(input = {}, options = {}) {
-    const assistantSurface = requireAssistantSurface(input?.targetSurfaceId);
+    const assistantSurface = requireAssistantSurface(appConfig, input?.targetSurfaceId);
     await requireSettingsAccess(assistantSurface, options?.context, {
       mode: "read"
     });
@@ -100,7 +87,7 @@ function createService({
   }
 
   async function updateSettings(input = {}, patch = {}, options = {}) {
-    const assistantSurface = requireAssistantSurface(input?.targetSurfaceId);
+    const assistantSurface = requireAssistantSurface(appConfig, input?.targetSurfaceId);
     await requireSettingsAccess(assistantSurface, options?.context, {
       mode: "write"
     });
@@ -116,7 +103,7 @@ function createService({
   }
 
   async function resolveSystemPrompt(assistantSurface, workspace = null, _options = {}, serviceOptions = {}) {
-    const resolvedAssistantSurface = requireAssistantSurface(assistantSurface?.targetSurfaceId);
+    const resolvedAssistantSurface = requireAssistantSurface(appConfig, assistantSurface?.targetSurfaceId);
     const workspaceId = resolveConfigWorkspaceId(
       resolvedAssistantSurface,
       workspace,

package/src/server/services/chatService.js

@@ -2,11 +2,12 @@ import { isDeepStrictEqual } from "node:util";
 import { AppError } from "@jskit-ai/kernel/server/runtime";
 import { normalizeObject, normalizeRecordId, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 import { resolveWorkspaceSlug } from "@jskit-ai/assistant-core/server";
-import { ASSISTANT_STREAM_EVENT_TYPES, isAssistantProgressOnlyText } from "@jskit-ai/assistant-core/shared";
-import { resolveAssistantSurfaceConfig } from "../../shared/assistantSurfaces.js";
+import { conversationAttachmentIds } from "@jskit-ai/assistant-core/server/conversation";
+import { ASSISTANT_STREAM_EVENT_TYPES, MAX_HISTORY_MESSAGES, MAX_INPUT_CHARS, isAssistantProgressOnlyText } from "@jskit-ai/assistant-core/shared";
+import { exposedAppErrorDetails, errorStatus } from "../support/assistantErrors.js";
+import { requireAssistantSurface } from "../support/assistantSurface.js";
+import { ASSISTANT_STREAM_WRITER_METHODS } from "../support/assistantStreamWriter.js";
 
-const MAX_HISTORY_MESSAGES = 20;
-const MAX_INPUT_CHARS = 8000;
 const CLOCK_INSTRUCTION = "For current or relative date and time questions, first use any available authoritative workspace clock action; never infer the current date or time from model knowledge.";
 
 function normalizeConversationId(value) {
@@ -71,16 +72,7 @@ function normalizeStreamInput(payload = {}) {
 }
 
 function hasStreamWriter(streamWriter) {
-  return Boolean(
-    streamWriter &&
-      typeof streamWriter.sendMeta === "function" &&
-      typeof streamWriter.sendAssistantDelta === "function" &&
-      typeof streamWriter.sendAssistantMessage === "function" &&
-      typeof streamWriter.sendToolCall === "function" &&
-      typeof streamWriter.sendToolResult === "function" &&
-      typeof streamWriter.sendError === "function" &&
-      typeof streamWriter.sendDone === "function"
-  );
+  return ASSISTANT_STREAM_WRITER_METHODS.every(name => typeof streamWriter?.[name] === "function");
 }
 
 function isAbortError(error) {
@@ -157,15 +149,6 @@ function buildSystemPrompt({ targetSurfaceId = "", toolDescriptors = [], workspa
   return promptSegments.join(" ");
 }
 
-function requireAssistantSurface(appConfig = {}, targetSurfaceId = "") {
-  const assistantSurface = resolveAssistantSurfaceConfig(appConfig, targetSurfaceId);
-  if (assistantSurface) {
-    return assistantSurface;
-  }
-
-  throw new AppError(404, "Assistant not found.");
-}
-
 function buildAssistantActionContext(context = {}, assistantSurface = {}) {
   return {
     ...normalizeObject(context),
@@ -182,7 +165,6 @@ function createChatService({
   serviceToolCatalog,
   assistantConfigService,
   appConfig = {},
-  resolveAppConfig = null,
   workspaceScopeSupport = null
 } = {}) {
   if (!aiClientFactory || typeof aiClientFactory.resolveClient !== "function" || !turnRequests || !transcriptService || !serviceToolCatalog || !assistantConfigService) {
@@ -191,9 +173,6 @@ function createChatService({
     );
   }
 
-  const resolveCurrentAppConfig =
-    typeof resolveAppConfig === "function" ? resolveAppConfig : () => appConfig;
-
   function resolveRuntimeWorkspace(assistantSurface, context = {}, input = {}) {
     if (assistantSurface?.runtimeSurfaceRequiresWorkspace !== true) {
       return null;
@@ -230,7 +209,7 @@ function createChatService({
   }
 
   async function streamChat(payload = {}, options = {}) {
-    const assistantSurface = requireAssistantSurface(resolveCurrentAppConfig(), payload?.targetSurfaceId);
+    const assistantSurface = requireAssistantSurface(appConfig, payload?.targetSurfaceId);
     const context = normalizeObject(options.context);
     const assistantContext = buildAssistantActionContext(context, assistantSurface);
     const workspace = resolveRuntimeWorkspace(assistantSurface, assistantContext, payload);
@@ -270,9 +249,9 @@ function createChatService({
       result = await executeTurn();
     } catch (error) {
       response.failure = { message: String(error?.message || "Assistant request failed."),
-        status: Number(error?.status || error?.statusCode || 500),
+        status: errorStatus(error),
         ...(error instanceof AppError ? { code: error.code,
-          ...(error.details && String(error.code).trim() !== "ACTION_PERMISSION_DENIED" ? { details: error.details } : {}) } : {}) };
+          ...(exposedAppErrorDetails(error) ? { details: error.details } : {}) } : {}) };
       await turnRequests.update(claim, response, "failed");
       throw error;
     }
@@ -307,10 +286,8 @@ function createChatService({
       const resolvedAttachments = [];
       async function prepareAttachments(attachmentIds) {
         if (attachmentIds === undefined || (Array.isArray(attachmentIds) && !attachmentIds.length)) return;
-        if (!Array.isArray(attachmentIds) || attachmentIds.length > 10 ||
-            attachmentIds.some(id => typeof id !== "string" || !id || id.length > 256)) {
-          throw new AppError(400, "Invalid attachment identifiers.");
-        }
+        try { conversationAttachmentIds(attachmentIds); }
+        catch { throw new AppError(400, "Invalid attachment identifiers."); }
         if (!attachments?.resolve || !aiClient.supportsAttachments) {
           throw new AppError(400, "File attachments are not configured for this assistant.");
         }
@@ -402,7 +379,7 @@ function createChatService({
         streamWriter.sendError({ type: ASSISTANT_STREAM_EVENT_TYPES.ERROR, messageId: source.messageId,
           code: aborted ? "assistant_stream_aborted" : String(error?.code || "assistant_stream_failed"),
           message: aborted ? "Assistant request was cancelled." : String(error?.message || "Assistant request failed."),
-          status: aborted ? 499 : Number(error?.status || error?.statusCode || 500) });
+          status: aborted ? 499 : errorStatus(error) });
         streamWriter.sendDone({ type: ASSISTANT_STREAM_EVENT_TYPES.DONE, messageId: source.messageId, status });
         return { conversationId, messageId: source.messageId, status };
       } finally {
@@ -414,7 +391,7 @@ function createChatService({
   }
 
   async function listConversations(query = {}, options = {}) {
-    const assistantSurface = requireAssistantSurface(resolveCurrentAppConfig(), options?.input?.targetSurfaceId);
+    const assistantSurface = requireAssistantSurface(appConfig, options?.input?.targetSurfaceId);
     const context = normalizeObject(options.context);
     const assistantContext = buildAssistantActionContext(context, assistantSurface);
     const workspace = resolveRuntimeWorkspace(assistantSurface, assistantContext, options.input || {});
@@ -424,7 +401,7 @@ function createChatService({
   }
 
   async function getConversationMessages(conversationId, query = {}, options = {}) {
-    const assistantSurface = requireAssistantSurface(resolveCurrentAppConfig(), options?.input?.targetSurfaceId);
+    const assistantSurface = requireAssistantSurface(appConfig, options?.input?.targetSurfaceId);
     const context = normalizeObject(options.context);
     const assistantContext = buildAssistantActionContext(context, assistantSurface);
     const workspace = resolveRuntimeWorkspace(assistantSurface, assistantContext, options.input || {});