orch-mini 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orch-mini",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Orquestador declarativo mínimo: un stack.yaml describe la arquitectura, om renderiza docker-compose + nginx + scripts y levanta el stack.",
   "type": "module",
   "engines": {

package/src/info.ts

@@ -1,9 +1,7 @@
-import { existsSync } from 'node:fs';
-import { resolve } from 'node:path';
+import { relative } from 'node:path';
 import type { LoadedStack } from './parser.js';
 import { hasRepo, type Service, type Stack } from './schema.js';
 
-// Patrones que sugieren "el usuario debería completar esto antes de prod".
 const PLACEHOLDER_PATTERNS = [
   /^changeit-/i,
   /^dev-default-/i,
@@ -13,6 +11,9 @@ const PLACEHOLDER_PATTERNS = [
   /^your-/i,
 ];
 
+const WRAP_WIDTH = 78;
+const DESC_INDENT = '       ';   // 7 espacios — alineado con texto post-marker
+
 const C = supportsColor()
   ? {
       reset: '\x1b[0m',
@@ -22,8 +23,9 @@ const C = supportsColor()
       yellow: '\x1b[33m',
       green: '\x1b[32m',
       red: '\x1b[31m',
+      magenta: '\x1b[35m',
     }
-  : { reset: '', dim: '', bold: '', cyan: '', yellow: '', green: '', red: '' };
+  : { reset: '', dim: '', bold: '', cyan: '', yellow: '', green: '', red: '', magenta: '' };
 
 function supportsColor(): boolean {
   return process.stdout.isTTY === true && process.env.NO_COLOR === undefined;
@@ -32,13 +34,15 @@ function supportsColor(): boolean {
 export function renderInfo(loaded: LoadedStack): string {
   const out: string[] = [];
   const { stack } = loaded;
+  const sourceLabel = relative(process.cwd(), loaded.sourcePath) || loaded.sourcePath;
 
   const services = Object.entries(stack.services);
   const gw = stack.gateway;
 
   out.push(
-    header(`${stack.name}`) +
-      `  ${C.dim}${services.length} services${gw ? ` · gateway en :${gw.port}` : ''}${C.reset}`,
+    `${C.bold}${stack.name}${C.reset}  ${C.dim}${services.length} services${
+      gw ? ` · gateway en :${gw.port}` : ''
+    } · ${sourceLabel}${C.reset}`,
   );
 
   out.push('');
@@ -55,6 +59,7 @@ export function renderInfo(loaded: LoadedStack): string {
     for (const r of repos) {
       const refLabel = r.ref ?? `${C.dim}(default branch)${C.reset}`;
       out.push(`  ${r.slug.padEnd(maxName + 2)}${refLabel}`);
+      out.push(`  ${' '.repeat(maxName + 2)}${C.dim}${r.url}${C.reset}`);
     }
   }
 
@@ -73,9 +78,7 @@ export function renderInfo(loaded: LoadedStack): string {
     const sorted = [...gw.routes].sort(
       (a, b) => effectiveLen(b.path) - effectiveLen(a.path),
     );
-    const maxUrl = Math.max(
-      ...sorted.map((r) => urlFor(gw.port, r.path).length),
-    );
+    const maxUrl = Math.max(...sorted.map((r) => urlFor(gw.port, r.path).length));
     for (const route of sorted) {
       const url = urlFor(gw.port, route.path);
       const note = route.strip_prefix ? `  ${C.dim}(strip prefix)${C.reset}` : '';
@@ -86,26 +89,44 @@ export function renderInfo(loaded: LoadedStack): string {
   const debugConfigs = services.filter(([, s]) => s.debug_port !== undefined);
   if (debugConfigs.length > 0) {
     out.push('');
-    out.push(section('Debug (VS Code attach via om vscode)'));
+    out.push(section('Debug') + `  ${C.dim}(om vscode genera launch.json)${C.reset}`);
+    const maxName = Math.max(...debugConfigs.map(([n]) => n.length));
     for (const [name, svc] of debugConfigs) {
-      out.push(`  ${name.padEnd(30)} attach → localhost:${svc.debug_port}`);
+      out.push(
+        `  ${name.padEnd(maxName + 2)}${C.dim}attach →${C.reset} localhost:${svc.debug_port}`,
+      );
     }
   }
 
-  const concerns = collectConcerns(stack, loaded.workDir);
+  const concerns = collectConcerns(loaded);
   if (concerns.length > 0) {
     out.push('');
     out.push(`${C.yellow}⚠${C.reset}  ${C.bold}Probablemente quieras tocar${C.reset}`);
-    const maxKey = Math.max(...concerns.map((c) => `${c.service}.${c.key}`.length));
-    for (const c of concerns) {
-      const k = `${c.service}.${c.key}`.padEnd(maxKey + 2);
-      const tag = c.required ? `${C.red}[required]${C.reset} ` : '';
-      out.push(`  ${tag}${k}${C.dim}${c.reason}${C.reset}`);
-      if (c.description) {
-        // Indenta la descripción debajo, alineada con el nombre del key.
-        out.push(`  ${' '.repeat(maxKey + 2 + (c.required ? 11 : 0))}${C.dim}↳ ${c.description}${C.reset}`);
+    const grouped = groupByService(concerns);
+    for (const [svcName, items] of grouped) {
+      out.push('');
+      out.push(`  ${C.cyan}${svcName}${C.reset}`);
+      for (const c of items) {
+        out.push(`    ${renderConcernLine(c)}`);
+        if (c.location) {
+          out.push(`    ${DESC_INDENT}${C.dim}${c.location}${C.reset}`);
+        }
+        if (c.description) {
+          for (const line of wrapText(c.description, WRAP_WIDTH - DESC_INDENT.length)) {
+            out.push(`    ${DESC_INDENT}${C.dim}${line}${C.reset}`);
+          }
+        }
       }
     }
+
+    out.push('');
+    const requiredCount = concerns.filter((c) => c.required).length;
+    const optionalCount = concerns.length - requiredCount;
+    out.push(
+      `  ${C.dim}Total:${C.reset} ${
+        requiredCount > 0 ? `${C.red}${requiredCount} required${C.reset}` : `${C.green}0 required${C.reset}`
+      }${C.dim} · ${optionalCount} opcionales${C.reset}`,
+    );
   } else {
     out.push('');
     out.push(`${C.green}✓${C.reset} no detecté placeholders ni valores vacíos`);
@@ -114,8 +135,45 @@ export function renderInfo(loaded: LoadedStack): string {
   return out.join('\n') + '\n';
 }
 
-function header(text: string): string {
-  return `${C.bold}${text}${C.reset}`;
+function renderConcernLine(c: Concern): string {
+  const marker = c.required
+    ? `${C.red}✗${C.reset}`
+    : c.reason.startsWith('placeholder')
+    ? `${C.yellow}!${C.reset}`
+    : `${C.dim}·${C.reset}`;
+  const tag = c.required ? ` ${C.red}[required]${C.reset}` : '';
+  return `${marker}${tag} ${C.bold}${c.key}${C.reset} ${C.dim}— ${c.reason}${C.reset}`;
+}
+
+function groupByService(concerns: Concern[]): Map<string, Concern[]> {
+  const grouped = new Map<string, Concern[]>();
+  for (const c of concerns) {
+    const list = grouped.get(c.service) ?? [];
+    list.push(c);
+    grouped.set(c.service, list);
+  }
+  // Ordenar items de cada service: required arriba.
+  for (const list of grouped.values()) {
+    list.sort((a, b) => (b.required ? 1 : 0) - (a.required ? 1 : 0));
+  }
+  return grouped;
+}
+
+function wrapText(text: string, width: number): string[] {
+  if (text.length <= width) return [text];
+  const words = text.split(/\s+/);
+  const lines: string[] = [];
+  let current = '';
+  for (const word of words) {
+    if ((current + ' ' + word).trim().length > width) {
+      if (current) lines.push(current);
+      current = word;
+    } else {
+      current = (current + ' ' + word).trim();
+    }
+  }
+  if (current) lines.push(current);
+  return lines;
 }
 
 function section(text: string): string {
@@ -134,11 +192,7 @@ function formatServiceRow(name: string, svc: Service): string {
 }
 
 function shortenRepo(repo: string): string {
-  // github.com/logieinc/foo.git → foo, /local → local
-  return repo
-    .replace(/\.git$/, '')
-    .split(/[/:]/)
-    .pop() ?? repo;
+  return repo.replace(/\.git$/, '').split(/[/:]/).pop() ?? repo;
 }
 
 function urlFor(port: number, path: string): string {
@@ -150,17 +204,14 @@ function effectiveLen(path: string): number {
   return path.replace(/^(=|\^~)\s*/, '').length;
 }
 
-type RepoEntry = { slug: string; ref: string | undefined };
+type RepoEntry = { slug: string; ref: string | undefined; url: string };
 
 function collectRepos(stack: Stack): RepoEntry[] {
   const seen = new Map<string, RepoEntry>();
   for (const svc of Object.values(stack.services)) {
     if (!hasRepo(svc)) continue;
-    const slug = svc.repo
-      .replace(/\.git$/, '')
-      .split(/[/:]/)
-      .pop()!;
-    if (!seen.has(slug)) seen.set(slug, { slug, ref: svc.ref });
+    const slug = svc.repo.replace(/\.git$/, '').split(/[/:]/).pop()!;
+    if (!seen.has(slug)) seen.set(slug, { slug, ref: svc.ref, url: svc.repo });
   }
   return [...seen.values()];
 }
@@ -181,12 +232,14 @@ type Concern = {
   reason: string;
   description?: string;
   required?: boolean;
+  location?: string;       // "arch/stack.yaml:42" — clickeable en VS Code terminal
 };
 
-function collectConcerns(stack: Stack, _workDir: string): Concern[] {
+function collectConcerns(loaded: LoadedStack): Concern[] {
   const out: Concern[] = [];
+  const sourceRel = relative(process.cwd(), loaded.sourcePath) || loaded.sourcePath;
 
-  for (const [svcName, svc] of Object.entries(stack.services)) {
+  for (const [svcName, svc] of Object.entries(loaded.stack.services)) {
     const meta = svc.env_meta ?? {};
     for (const [k, vRaw] of Object.entries(svc.env ?? {})) {
       const v = String(vRaw);
@@ -195,27 +248,21 @@ function collectConcerns(stack: Stack, _workDir: string): Concern[] {
       let reason: string | null = null;
       if (v === '') reason = 'vacío';
       else if (PLACEHOLDER_PATTERNS.some((re) => re.test(v))) {
-        reason = `placeholder: "${truncate(v, 30)}"`;
-      } else if (m.required === true) {
-        // Marcado como required en la metadata, pero ya tiene valor — no es concern.
+        reason = `placeholder "${truncate(v, 30)}"`;
       }
 
       if (reason !== null) {
         const concern: Concern = { service: svcName, key: k, reason };
         if (m.description) concern.description = m.description;
         if (m.required) concern.required = m.required;
+        const loc = loaded.locations.get(`${svcName}.${k}`);
+        if (loc) concern.location = `${sourceRel}:${loc.line}:${loc.col}`;
         out.push(concern);
       }
     }
   }
 
-  // Required arriba (los más urgentes), después el resto.
-  return out.sort((a, b) => {
-    if ((b.required ? 1 : 0) - (a.required ? 1 : 0) !== 0) {
-      return (b.required ? 1 : 0) - (a.required ? 1 : 0);
-    }
-    return 0;
-  });
+  return out;
 }
 
 function truncate(s: string, max: number): string {

package/src/parser.ts

@@ -1,17 +1,22 @@
 import { readFileSync } from 'node:fs';
 import { basename, dirname, resolve } from 'node:path';
-import { parse as parseYaml } from 'yaml';
+import { isMap, isPair, isScalar, LineCounter, parseDocument } from 'yaml';
 import { z } from 'zod';
 import { expandFileRefs } from './file-refs.js';
 import { findStack, STACK_FILENAME, STACK_SUBDIRS } from './discover.js';
 import { stackSchema, type Stack } from './schema.js';
 
+// Mapa de "service.envKey" → {line, col} del archivo fuente.
+// Habilita reportes con archivo:línea clickeables en VS Code terminal.
+export type Locations = Map<string, { line: number; col: number }>;
+
 export type LoadedStack = {
   stack: Stack;
   sourcePath: string;
   workDir: string;          // dirname(stack.yaml)
   workspaceRoot: string;    // donde van repos/ y .stack/ — padre del workDir si el yaml vive en arch/
   outDir: string;           // workspaceRoot/.stack
+  locations: Locations;
 };
 
 export function loadStack(stackPath?: string): LoadedStack {
@@ -36,18 +41,23 @@ export function loadStack(stackPath?: string): LoadedStack {
     throw new Error(`no se pudo leer el stack en ${absPath}: ${msg}`);
   }
 
-  let doc: unknown;
+  const lineCounter = new LineCounter();
+  let docNode: ReturnType<typeof parseDocument>;
   try {
-    doc = parseYaml(raw);
+    docNode = parseDocument(raw, { lineCounter });
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     throw new Error(`YAML inválido en ${absPath}: ${msg}`);
   }
 
   const workDir = resolve(absPath, '..');
+  const locations = collectLocations(docNode, lineCounter);
+
+  // Plain JS desde el AST para los pasos siguientes.
+  const docPlain = docNode.toJSON();
 
   // Expandir ${file:path} antes de validar — paths se resuelven relativo al workDir.
-  const expanded = expandFileRefs(doc, workDir);
+  const expanded = expandFileRefs(docPlain, workDir);
 
   // Normalizar el formato mixed de env (string | {value, description, required})
   // a dos campos planos: env (Record<string,string>) + env_meta (descripciones).
@@ -66,9 +76,44 @@ export function loadStack(stackPath?: string): LoadedStack {
     workDir,
     workspaceRoot,
     outDir: resolve(workspaceRoot, '.stack'),
+    locations,
   };
 }
 
+// Recorre el AST del YAML y extrae line/col de cada services.<svc>.env.<KEY>.
+// El path es el del KEY del par (donde el usuario debería pararse para editar).
+function collectLocations(
+  doc: ReturnType<typeof parseDocument>,
+  lineCounter: LineCounter,
+): Locations {
+  const locations: Locations = new Map();
+  const services = doc.get('services', true);
+  if (!isMap(services)) return locations;
+
+  for (const svcPair of services.items) {
+    if (!isPair(svcPair) || !isScalar(svcPair.key)) continue;
+    const svcName = String(svcPair.key.value);
+
+    const svcNode = svcPair.value;
+    if (!isMap(svcNode)) continue;
+
+    const envNode = svcNode.get('env', true);
+    if (!isMap(envNode)) continue;
+
+    for (const envPair of envNode.items) {
+      if (!isPair(envPair) || !isScalar(envPair.key)) continue;
+      const keyNode = envPair.key;
+      const key = String(keyNode.value);
+      const range = keyNode.range;
+      if (!range) continue;
+      const pos = lineCounter.linePos(range[0]);
+      locations.set(`${svcName}.${key}`, { line: pos.line, col: pos.col });
+    }
+  }
+
+  return locations;
+}
+
 function computeWorkspaceRoot(workDir: string): string {
   // Si el stack.yaml vive en un subdir convencional (arch/), el workspaceRoot
   // es el padre — repos/ y .stack/ no se mezclan con la definición.