@formigio/fazemos-cli 0.10.66 → 0.10.67

package/dist/index.js

@@ -7514,6 +7514,10 @@ function exitNoActiveProjectForAgentsList() {
 function formatAgentSource(source) {
     if (source === 'project_override')
         return 'project-override';
+    if (source === 'org_file')
+        return 'org-file';
+    if (source === 'project_file')
+        return 'project-file';
     return source;
 }
 /**
@@ -7781,11 +7785,26 @@ agentsCmd
         const { orgId, projectId } = await requireProjectForAgents(opts.project);
         const data = await api('GET', `/api/organizations/${orgId}/projects/${projectId}/agents/${encodeURIComponent(name)}`, undefined, { noProjectHeader: true });
         const a = data.agent;
+        const resolution = data.resolution;
         const proj = findProjectById(orgId, projectId);
         const projSlug = proj?.slug ?? projectId;
-        const sourceLabel = formatAgentSource(a.source);
+        // Use resolution.agent_source (F18-aware) when available; fall back to
+        // a.source (F17-only) for older API versions (degrade per §6).
+        const effectiveSource = resolution?.agent_source ?? a.source;
+        const sourceLabel = formatAgentSource(effectiveSource);
         console.log(chalk.cyan(`Agent: ${a.name}  (${a.display_name})`));
         console.log(`Project: ${projSlug}  ·  Source: ${sourceLabel}`);
+        // Role doc line — show immediately after source when a role doc is active.
+        // Uses agent.role_doc_path populated by the API's F18 layer. When the API
+        // is newer (resolution block present), also shows the resolved prompt length
+        // so an empty role-doc stub is visible without a CloudWatch query (R10).
+        if (a.role_doc_path) {
+            const level = a.role_doc_level ? ` (level: ${a.role_doc_level})` : '';
+            console.log(chalk.gray(`  Role doc: ${a.role_doc_path}${level}`));
+            if (resolution?.resolved_system_prompt_length !== undefined) {
+                console.log(chalk.gray(`  Resolved prompt: ${resolution.resolved_system_prompt_length.toLocaleString()} chars`));
+            }
+        }
         console.log('');
         // EFFECTIVE CONFIG
         console.log(chalk.cyan('EFFECTIVE CONFIG'));
@@ -7837,12 +7856,6 @@ agentsCmd
             const label = a.source === 'project_override' ? 'Override created' : 'Project-only created';
             console.log(chalk.gray(`${label}: ${new Date(a.override_updated_at).toISOString().slice(0, 10)}`));
         }
-        // F18 forward-compat: role doc line only when populated.
-        if (a.role_doc_path) {
-            const level = a.role_doc_level ? ` (${a.role_doc_level})` : '';
-            console.log('');
-            console.log(chalk.gray(`Role doc: ${a.role_doc_path}${level}`));
-        }
     }
     catch (err) {
         if (err instanceof ApiError && err.code === 'AGENT_NOT_FOUND') {
@@ -8545,9 +8558,11 @@ agentsCmd
     .description('Upload an agent definition file to Fazemos')
     .argument('<name>', 'Agent name')
     .argument('<file>', 'Path to agent definition .md file')
-    .action(async (name, file) => {
+    .option('--project <slug>', 'Project context for role-doc check (uses active project if not set)')
+    .option('--force', 'Proceed even when a role doc overrides the DB systemPrompt at runtime', false)
+    .action(async (name, file, opts) => {
     try {
-        // Resolve agent name to member ID
+        // Resolve agent name to member ID (org-level members list)
         const orgId = getActiveOrgId();
         if (!orgId) {
             console.error(chalk.red('No active org'));
@@ -8560,11 +8575,68 @@ agentsCmd
             console.error(chalk.red(`Agent "${name}" not found`));
             process.exit(1);
         }
-        // Read file and strip YAML frontmatter
-        const raw = readFileSync(resolve(file), 'utf-8');
-        const body = raw.replace(/^---\r?\n[\s\S]*?\r?\n---\r?\n?/, '').trim();
-        await api('PATCH', `/api/members/${agent.id}/agent-config`, { systemPrompt: body });
-        console.log(chalk.green(`Uploaded definition for ${agent.display_name} (${body.length} chars)`));
+        // BUG-PERSONA-RESOLUTION-PATHS-DISAGREE fix (R9, AC-9):
+        // Before PATCHing the DB, check whether a role doc overrides the
+        // systemPrompt at runtime. If so, the upload is silently inert — warn
+        // and refuse unless --force is passed.
+        //
+        // Predicate is derived from the API's resolution.has_role_doc field
+        // (predicate-based, NOT a name-list allowlist — rul_respaths_predicate_not_allowlist).
+        // Requires a project context to call the F17 detail endpoint that carries
+        // the resolution block. When no project context is available, skip the
+        // check and proceed (defensive degrade per §6 — same behavior as today).
+        //
+        // proceedWithUpload is set to false BEFORE process.exit(1) so that test
+        // environments where process.exit is mocked still gate the PATCH correctly.
+        let proceedWithUpload = true;
+        if (!opts.force) {
+            // Resolve project context: --project flag → active project → none.
+            let projectId = null;
+            if (opts.project) {
+                const proj = findProjectBySlug(orgId, opts.project);
+                projectId = proj?.id ?? null;
+                if (!projectId) {
+                    proceedWithUpload = false;
+                    console.error(chalk.red(`Project "${opts.project}" not found`));
+                    process.exit(1);
+                }
+            }
+            else {
+                projectId = getActiveProjectId();
+            }
+            if (proceedWithUpload && projectId) {
+                // Fetch the F17 detail endpoint (now F18-aware) to get the resolution block.
+                // Use agent.name (lowercase slug) as the URL param.
+                const agentName = agent.name ?? norm(name).replace(/\s+/g, '-');
+                try {
+                    const detailData = await api('GET', `/api/organizations/${orgId}/projects/${projectId}/agents/${encodeURIComponent(agentName)}`, undefined, { noProjectHeader: true });
+                    // Defensive degrade: if resolution block is absent (older API), treat as
+                    // has_role_doc=false and proceed — behavior identical to today (§6 / EC-7).
+                    if (detailData.resolution?.has_role_doc === true) {
+                        const roleDocPath = detailData.resolution.role_doc_path ?? '(unknown path)';
+                        proceedWithUpload = false; // Gate PATCH before calling exit (for test environments).
+                        console.error(chalk.yellow(`⚠  a role doc at ${roleDocPath} overrides the DB systemPrompt at runtime —`));
+                        console.error(chalk.yellow(`    this upload will not take effect. Edit the file instead, or re-run with --force`));
+                        console.error(chalk.yellow(`    if you deliberately want to write the DB value.`));
+                        process.exit(1);
+                    }
+                }
+                catch (detailErr) {
+                    // Detail-fetch failure should not block the upload — fall through.
+                    // The PATCH may still be inert if a role doc exists, but we cannot
+                    // determine that without the API's resolution block.
+                    console.error(chalk.gray(`(role-doc check skipped: ${detailErr.message})`));
+                }
+            }
+            // No project context → skip check, proceed as before.
+        }
+        if (proceedWithUpload) {
+            // Read file and strip YAML frontmatter
+            const raw = readFileSync(resolve(file), 'utf-8');
+            const body = raw.replace(/^---\r?\n[\s\S]*?\r?\n---\r?\n?/, '').trim();
+            await api('PATCH', `/api/members/${agent.id}/agent-config`, { systemPrompt: body });
+            console.log(chalk.green(`Uploaded definition for ${agent.display_name} (${body.length} chars)`));
+        }
     }
     catch (err) {
         console.error(chalk.red(err.message));