@aifabrix/builder 2.53.1 → 2.55.0

package/lib/api/work-search.api.js

@@ -0,0 +1,163 @@
+/**
+ * Layer B work.skills / work.search client for role-assistant test cases.
+ *
+ * @fileoverview Execute governed Role Assistant search tools via Dataplane MCP
+ * @author AI Fabrix Team
+ * @version 1.0.0
+ */
+
+'use strict';
+
+const { createDataplaneApiClient } = require('./index');
+const { unwrapApiData } = require('../utils/external-system-readiness-core');
+
+const SEARCH_TIMEOUT_MS = 120000;
+const LAYER_B_SYSTEM_KEY = process.env.RUNTIME_ORCHESTRATION_SYSTEM_KEY || 'runtime-orchestration';
+const LAYER_B_TOOLS = Object.freeze({
+  roles: { resourceType: 'work-roles', toolName: 'work_roles.list' },
+  skills: { resourceType: 'work-skills', toolName: 'work_skills.get' },
+  search: { resourceType: 'work-search', toolName: 'work_search.create' }
+});
+
+function buildLayerBExecutePath(tool) {
+  const systemKey = encodeURIComponent(LAYER_B_SYSTEM_KEY);
+  const resourceType = encodeURIComponent(tool.resourceType);
+  const toolName = encodeURIComponent(tool.toolName);
+  return `/api/v1/mcp/servers/${systemKey}/${resourceType}/tools/${toolName}/execute`;
+}
+
+function pushText(parts, value) {
+  if (typeof value === 'string' && value.trim()) {
+    parts.push(value.trim());
+  }
+}
+
+function extractErrorText(res) {
+  const parts = [];
+  pushText(parts, res && res.error);
+  pushText(parts, res && res.formattedError);
+  const data = res && res.errorData;
+  if (data && typeof data === 'object') {
+    pushText(parts, data.error);
+    pushText(parts, data.detail);
+    pushText(parts, data.title);
+    pushText(parts, data.message);
+  }
+  return parts.join(' ');
+}
+
+/**
+ * MCP execute sometimes wraps a single JSON object as a one-element array.
+ * @param {*} value
+ * @returns {*}
+ */
+function unwrapSingletonObject(value) {
+  if (Array.isArray(value) && value.length === 1 && value[0] && typeof value[0] === 'object') {
+    return value[0];
+  }
+  return value;
+}
+
+function unwrapExecutePayload(res) {
+  const body = unwrapSingletonObject(unwrapApiData(res));
+  if (!body || typeof body !== 'object') {
+    return body;
+  }
+  if (body.result && typeof body.result === 'object') {
+    return unwrapSingletonObject(body.result);
+  }
+  if (body.json && typeof body.json === 'object') {
+    return unwrapSingletonObject(body.json);
+  }
+  if (body.root && typeof body.root === 'object') {
+    return unwrapSingletonObject(body.root);
+  }
+  return body;
+}
+
+function normalizeLayerBResult(res) {
+  const status = Number(res && (res.status || res.statusCode)) || (res && res.success === false ? 0 : 200);
+  const payload = unwrapExecutePayload(res);
+  const errorText = res && res.success === false ? extractErrorText(res) : '';
+  return {
+    status,
+    payload,
+    errorText,
+    raw: res
+  };
+}
+
+/**
+ * Execute a Layer B MCP tool.
+ * POST /api/v1/mcp/servers/{system}/{resourceType}/tools/{tool}/execute
+ * @requiresPermission {Dataplane} Authenticated (oauth2: [])
+ * @async
+ * @param {string} dataplaneUrl
+ * @param {Object} authConfig
+ * @param {{ resourceType: string, toolName: string }} tool
+ * @param {Object} [args]
+ * @returns {Promise<{ status: number, payload: Object|null, errorText: string, raw: Object }>}
+ */
+async function executeLayerBTool(dataplaneUrl, authConfig, tool, args = {}) {
+  const client = createDataplaneApiClient(dataplaneUrl, authConfig);
+  const res = await client.post(buildLayerBExecutePath(tool), {
+    body: { arguments: args && typeof args === 'object' ? args : {} },
+    timeoutMs: SEARCH_TIMEOUT_MS
+  });
+  return normalizeLayerBResult(res);
+}
+
+/**
+ * GET-equivalent work.roles for the current caller.
+ * @requiresPermission {Dataplane} Authenticated (oauth2: [])
+ * @async
+ * @param {string} dataplaneUrl
+ * @param {Object} authConfig
+ * @returns {Promise<{ status: number, payload: Object|null, errorText: string, raw: Object }>}
+ */
+async function getWorkRoles(dataplaneUrl, authConfig) {
+  return executeLayerBTool(dataplaneUrl, authConfig, LAYER_B_TOOLS.roles, {});
+}
+
+/**
+ * GET-equivalent work.skills for one roleRef.
+ * Requests detail=full so search.resourceTypes (executable grammar) is present.
+ * Compact summary omits that slice and cannot evaluate named viewpoint ops.
+ * @requiresPermission {Dataplane} Authenticated (oauth2: [])
+ * @async
+ */
+async function getWorkSkills(dataplaneUrl, authConfig, roleRef) {
+  return executeLayerBTool(dataplaneUrl, authConfig, LAYER_B_TOOLS.skills, {
+    roleRef: String(roleRef || '').trim(),
+    detail: 'full'
+  });
+}
+
+/**
+ * POST-equivalent work.search for one roleRef.
+ * @requiresPermission {Dataplane} Authenticated (oauth2: [])
+ * @async
+ */
+async function searchWork(dataplaneUrl, authConfig, body) {
+  return executeLayerBTool(
+    dataplaneUrl,
+    authConfig,
+    LAYER_B_TOOLS.search,
+    body && typeof body === 'object' ? body : {}
+  );
+}
+
+module.exports = {
+  LAYER_B_SYSTEM_KEY,
+  LAYER_B_TOOLS,
+  SEARCH_TIMEOUT_MS,
+  buildLayerBExecutePath,
+  extractErrorText,
+  unwrapSingletonObject,
+  unwrapExecutePayload,
+  normalizeLayerBResult,
+  executeLayerBTool,
+  getWorkRoles,
+  getWorkSkills,
+  searchWork
+};

package/lib/api/work.api.js

@@ -7,7 +7,9 @@
 'use strict';
 
 const { createDataplaneApiClient } = require('./index');
+const { throwIfApiFailed } = require('./api-response-errors');
 const { unwrapApiData } = require('../utils/external-system-readiness-core');
+const { pickHumanRespondBody } = require('../role-assistant/test-runner-respond-body');
 
 /** Work Hub plan create runs LLM planning; 30s default is too short under load/reload. */
 const WORK_PLAN_TIMEOUT_MS = 120000;
@@ -59,7 +61,10 @@ function assertObjectShape(value, fallbackMessage) {
  */
 async function startWorkIntent(dataplaneUrl, authConfig, body) {
   const client = createDataplaneApiClient(dataplaneUrl, authConfig);
-  const res = await client.post('/api/v1/work/start', { body });
+  const res = await client.post('/api/v1/work/start', {
+    body,
+    timeoutMs: WORK_PLAN_TIMEOUT_MS
+  });
   if (res && res.success === false) {
     throw new Error(extractApiErrorMessage(res, 'work.start request failed'));
   }
@@ -70,7 +75,7 @@ async function startWorkIntent(dataplaneUrl, authConfig, body) {
 
 /**
  * GET /api/v1/work/executions/{processExecutionId}
- * @requiresPermission {Dataplane} worker-task:read
+ * @requiresPermission {Dataplane} worker:read
  * @async
  * @param {string} dataplaneUrl
  * @param {Object} authConfig
@@ -80,12 +85,13 @@ async function startWorkIntent(dataplaneUrl, authConfig, body) {
 async function getWorkExecutionStatus(dataplaneUrl, authConfig, processExecutionId) {
   const client = createDataplaneApiClient(dataplaneUrl, authConfig);
   const encodedId = encodeURIComponent(String(processExecutionId));
-  const res = await client.get(`/api/v1/work/executions/${encodedId}`, {
+  const endpoint = `/api/v1/work/executions/${encodedId}`;
+  const res = await client.get(endpoint, {
     timeoutMs: WORK_TASK_TIMEOUT_MS
   });
-  if (res && res.success === false) {
-    throw new Error(extractApiErrorMessage(res, 'work.status request failed'));
-  }
+  throwIfApiFailed(res, {
+    endpointUrl: `${String(dataplaneUrl || '').replace(/\/$/, '')}${endpoint}`
+  });
   const unwrapped = unwrapWorkPayload(res);
   assertObjectShape(unwrapped, 'work.status returned an unexpected response shape');
   return unwrapped;
@@ -105,7 +111,7 @@ async function respondWorkExecution(dataplaneUrl, authConfig, processExecutionId
   const client = createDataplaneApiClient(dataplaneUrl, authConfig);
   const encodedId = encodeURIComponent(String(processExecutionId));
   const res = await client.post(`/api/v1/work/executions/${encodedId}/respond`, {
-    body,
+    body: pickHumanRespondBody(body),
     timeoutMs: WORK_TASK_TIMEOUT_MS
   });
   if (res && res.success === false) {
@@ -143,7 +149,7 @@ async function continueWorkExecution(dataplaneUrl, authConfig, processExecutionI
 
 /**
  * GET /api/v1/work/executions/{processExecutionId}/result
- * @requiresPermission {Dataplane} worker-task:read
+ * @requiresPermission {Dataplane} worker:read
  * @async
  * @param {string} dataplaneUrl
  * @param {Object} authConfig
@@ -154,6 +160,7 @@ async function continueWorkExecution(dataplaneUrl, authConfig, processExecutionI
 async function getWorkExecutionResult(dataplaneUrl, authConfig, processExecutionId, query = {}) {
   const client = createDataplaneApiClient(dataplaneUrl, authConfig);
   const encodedId = encodeURIComponent(String(processExecutionId));
+  const endpoint = `/api/v1/work/executions/${encodedId}/result`;
   const params = {};
   if (query && typeof query === 'object') {
     if (query.requestedDepth) {
@@ -166,13 +173,13 @@ async function getWorkExecutionResult(dataplaneUrl, authConfig, processExecution
       params.projection = String(query.projection);
     }
   }
-  const res = await client.get(`/api/v1/work/executions/${encodedId}/result`, {
+  const res = await client.get(endpoint, {
     params,
     timeoutMs: WORK_TASK_TIMEOUT_MS
   });
-  if (res && res.success === false) {
-    throw new Error(extractApiErrorMessage(res, 'work.result request failed'));
-  }
+  throwIfApiFailed(res, {
+    endpointUrl: `${String(dataplaneUrl || '').replace(/\/$/, '')}${endpoint}`
+  });
   const unwrapped = unwrapWorkPayload(res);
   assertObjectShape(unwrapped, 'work.result returned an unexpected response shape');
   return unwrapped;

package/lib/app/list-external-systems.js

@@ -15,6 +15,7 @@ const { listExternalSystems } = require('../api/external-systems.api');
 const { formatApiError } = require('../utils/api-error-handler');
 const { getListAuthToken } = require('./list');
 const logger = require('../utils/logger');
+const { formatLifecycleLabel } = require('../utils/external-system-readiness-compact-display');
 
 /**
  * Normalize list response shapes from the dataplane API client.
@@ -56,7 +57,7 @@ function displayExternalSystems(systems, environment, dataplaneUrl, json) {
   systems.forEach((system) => {
     const key = system.key || system.systemKey || system.id || '—';
     const displayName = system.displayName || key;
-    const status = system.status || 'unknown';
+    const status = formatLifecycleLabel(system.status || 'unknown');
     logger.log(`✔ ${chalk.cyan(key)} - ${displayName} (${status})`);
   });
   logger.log(chalk.gray('  To show details: aifabrix show <systemKey> --online\n'));

package/lib/app/show-display.js

@@ -11,6 +11,11 @@
 
 const chalk = require('chalk');
 const logger = require('../utils/logger');
+const { formatCredentialShowLine } = require('../utils/authentication-slot-show');
+const {
+  formatConnectedSystemLifecycleLabel,
+  formatLifecycleLabel
+} = require('../utils/external-system-readiness-compact-display');
 
 function logSourceAndHeader(summary) {
   const isOffline = summary.source === 'offline';
@@ -93,14 +98,36 @@ function logApplicationFields(a) {
   logApplicationOptional(a);
 }
 
+/**
+ * Draft / Published / Archived only — never controller `active`.
+ * @param {Object} a
+ * @param {Object} [summary]
+ * @returns {string|null}
+ */
+function resolveExternalApplicationStatusLabel(a, summary) {
+  const ext = summary && summary.externalSystem;
+  const fromDataplane = ext && !ext.error ? (ext.status || ext.dataplaneStatus) : null;
+  return formatConnectedSystemLifecycleLabel(fromDataplane || a.status);
+}
+
+function logExternalApplicationStatus(a, summary) {
+  const label = resolveExternalApplicationStatusLabel(a, summary);
+  if (label) logger.log(`  Status:        ${label}`);
+}
+
+function formatDataplaneStatusDisplay(status) {
+  if (status === undefined || status === null || status === '' || status === '—') return '—';
+  return formatConnectedSystemLifecycleLabel(status) || formatLifecycleLabel(status);
+}
+
 /** Application section for online + external: Key, Display name, Description, Deployment, Status (no Type; Dataplane block follows). */
-function logApplicationFieldsOnlineExternal(a) {
+function logApplicationFieldsOnlineExternal(a, summary) {
   logger.log('🧷 Application - external');
   logger.log(`  Key:           ${a.key ?? '—'}`);
   logger.log(`  Display name:  ${a.displayName ?? '—'}`);
   logger.log(`  Description:   ${a.description ?? '—'}`);
   logger.log('  Deployment:    —');
-  if (a.status !== undefined && a.status !== '—') logger.log(`  Status:        ${a.status}`);
+  logExternalApplicationStatus(a, summary);
 }
 
 /** Application section for offline + external: Key, Display name, Description, Deployment, Status, Version when present. */
@@ -110,7 +137,7 @@ function logApplicationFieldsOfflineExternal(a) {
   logger.log(`  Display name:  ${a.displayName ?? '—'}`);
   logger.log(`  Description:   ${a.description ?? '—'}`);
   logger.log('  Deployment:    —');
-  if (a.status !== undefined && a.status !== '—') logger.log(`  Status:        ${a.status}`);
+  logExternalApplicationStatus(a);
   if (a.version !== undefined && a.version !== null) logger.log(`  Version:       ${a.version}`);
 }
 
@@ -129,7 +156,7 @@ function logApplicationSection(a, summary) {
   const onlineExternal = summary.source === 'online' && isExternal;
   const offlineExternal = summary.source === 'offline' && isExternal;
   if (onlineExternal) {
-    logApplicationFieldsOnlineExternal(a);
+    logApplicationFieldsOnlineExternal(a, summary);
   } else if (offlineExternal) {
     logApplicationFieldsOfflineExternal(a);
   } else {
@@ -205,8 +232,8 @@ function logDatabasesSection(dbNames) {
 function logExternalSystemMain(ext) {
   logger.log('🧩 Dataplane');
   logger.log(`  Version:       ${ext.version ?? '—'}`);
-  logger.log(`  Credential:    ${ext.credentialId ?? '—'}`);
-  logger.log(`  Status:        ${ext.status ?? '—'}`);
+  logger.log(`  Credential:    ${formatCredentialShowLine(ext)}`);
+  logger.log(`  Status:        ${formatDataplaneStatusDisplay(ext.status)}`);
   logger.log(`  API docs:      ${ext.openApiDocsPageUrl ?? ext.apiDocumentUrl ?? '—'}`);
   logger.log(`  MCP server:    ${ext.mcpServerUrl ?? '—'}`);
   logger.log(`  OpenAPI spec:  ${ext.apiDocumentUrl ?? '—'}`);

package/lib/app/show.js

@@ -33,6 +33,8 @@ const {
   attachCertificationVerifyFromDataplane,
   sanitizeCertificationForJson
 } = require('./certification-show-enrich');
+const { resolveManifestAuthMethod } = require('../utils/external-system-readiness-compact-display');
+const { resolveAuthenticationSlots } = require('../utils/authentication-slot-show');
 
 /**
  * Attach `runReloadDefault` / `runProxyDefault` from ~/.aifabrix `applications.<appKey>`.
@@ -466,6 +468,13 @@ function pickExternalVersion(res, config, system) {
   return (res && res.version) ?? config.version ?? system.version ?? '—';
 }
 
+function pickCredentialMethod(config, system) {
+  const source = config && (config.authentication || config.authentications) ? config : system;
+  const method = resolveManifestAuthMethod(source);
+  if (!method || method === 'unknown') return undefined;
+  return method;
+}
+
 function resolveExternalSystemMeta(res, config, system, application, appKey) {
   return {
     displayName: pickExternalDisplayName(res, system, application, appKey),
@@ -501,13 +510,27 @@ function buildBaseExternalResult(configData, appKey, openapiFiles, openapiEndpoi
       permissions: application.permissions
     },
     openapiFiles,
-    openapiEndpoints
+    openapiEndpoints,
+    credentialMethod: pickCredentialMethod(config, system),
+    authenticationSlots: resolveAuthenticationSlots(config, system)
   };
 }
 
+function applyCredentialFieldsToResult(result, res) {
+  if (res.credentialId !== undefined && res.credentialId !== null) result.credentialId = res.credentialId;
+  if (res.authenticationStatus !== undefined && res.authenticationStatus !== null) {
+    result.authenticationStatus = res.authenticationStatus;
+  }
+  const resConfig = res.config && typeof res.config === 'object' ? res.config : {};
+  const fromConfig = pickCredentialMethod(resConfig, {});
+  if (fromConfig) result.credentialMethod = fromConfig;
+  const fromSlots = resolveAuthenticationSlots(resConfig, {});
+  if (fromSlots.length > 0) result.authenticationSlots = fromSlots;
+}
+
 function applySystemResponseToResult(result, res) {
   result.dataplaneStatus = res.status;
-  if (res.credentialId !== undefined && res.credentialId !== null) result.credentialId = res.credentialId;
+  applyCredentialFieldsToResult(result, res);
   if (res.showOpenApiDocs !== undefined) result.showOpenApiDocs = res.showOpenApiDocs;
   if (res.mcpServerUrl !== undefined && res.mcpServerUrl !== null) result.mcpServerUrl = res.mcpServerUrl;
   if (res.apiDocumentUrl !== undefined && res.apiDocumentUrl !== null) result.apiDocumentUrl = res.apiDocumentUrl;