@nio-cli/cli 0.3.0 → 0.3.4

package/dist/tui/state.js

@@ -33,30 +33,29 @@ function reconcilePending(state, realId) {
         state.messages.splice(i, 1);
 }
 function applyPart(state, raw) {
-    const part = raw;
-    if (!part.messageID || !part.id)
+    const messageID = raw.messageID;
+    if (!messageID || !raw.id)
         return;
-    const type = part.type ?? 'text';
-    if (type === 'step-start' || type === 'step-finish')
-        return;
-    reconcilePending(state, part.messageID);
-    const msg = upsertMessage(state, part.messageID, 'assistant');
-    if (type === 'tool') {
-        const cp = upsertPart(msg, part.id, 'tool');
-        cp.text = part.state?.title ?? part.tool ?? 'tool';
-        cp.tool = {
-            status: part.state?.status ?? 'running',
-            output: String(part.state?.output ?? part.state?.error ?? ''),
-        };
-    }
-    else if (typeof part.text === 'string') {
-        upsertPart(msg, part.id, type === 'reasoning' ? 'reasoning' : 'text').text = part.text;
-    }
+    reconcilePending(state, messageID);
+    applyPartInto(upsertMessage(state, messageID, 'assistant'), raw);
 }
 export function applyEvent(prev, evt) {
     const state = clone(prev);
     const p = evt.properties ?? {};
     tlog('event', evt.type, JSON.stringify(p).slice(0, 200));
+    const etype = evt.type;
+    if (etype === 'permission.asked' || etype === 'permission.updated') {
+        const perm = p;
+        if (perm.id && perm.sessionID) {
+            const what = perm.patterns?.length ? ` ${perm.patterns.join(', ')}` : '';
+            state.permission = {
+                id: perm.id,
+                sessionId: perm.sessionID,
+                title: perm.title ?? `${perm.permission ?? perm.tool?.name ?? 'ação'}${what}`,
+            };
+        }
+        return state;
+    }
     switch (evt.type) {
         case 'message.updated': {
             const info = (p.info ?? p);
@@ -69,13 +68,6 @@ export function applyEvent(prev, evt) {
         case 'message.part.updated':
             applyPart(state, (p.part ?? p));
             break;
-        case 'permission.updated': {
-            const perm = p;
-            if (perm.id && perm.sessionID) {
-                state.permission = { id: perm.id, sessionId: perm.sessionID, title: perm.title ?? 'permissão' };
-            }
-            break;
-        }
         case 'permission.replied':
             state.permission = null;
             break;
@@ -92,6 +84,41 @@ export function applyEvent(prev, evt) {
     }
     return state;
 }
+export function syncMessages(prev, raw, busy) {
+    const state = { messages: [], busy, permission: prev.permission };
+    for (const m of raw) {
+        if (!m.info?.id)
+            continue;
+        const msg = upsertMessage(state, m.info.id, m.info.role === 'user' ? 'user' : 'assistant');
+        for (const raw of m.parts ?? [])
+            applyPartInto(msg, raw);
+    }
+    const pending = prev.messages.find((x) => x.id === PENDING_USER);
+    if (pending && !state.messages.some((x) => x.role === 'user' && sameText(x, pending))) {
+        state.messages.push(pending);
+    }
+    return state;
+}
+function sameText(a, b) {
+    const t = (m) => m.parts.map((p) => p.text).join('').trim();
+    return t(a) === t(b);
+}
+function applyPartInto(msg, raw) {
+    const part = raw;
+    if (!part.id)
+        return;
+    const type = part.type ?? 'text';
+    if (type === 'step-start' || type === 'step-finish')
+        return;
+    if (type === 'tool') {
+        const cp = upsertPart(msg, part.id, 'tool');
+        cp.text = part.state?.title ?? part.tool ?? 'tool';
+        cp.tool = { status: part.state?.status ?? 'running', output: String(part.state?.output ?? part.state?.error ?? '') };
+    }
+    else if (typeof part.text === 'string') {
+        upsertPart(msg, part.id, type === 'reasoning' ? 'reasoning' : 'text').text = part.text;
+    }
+}
 export function pushUserMessage(prev, text) {
     return {
         messages: [

package/dist/tui/state.js.map

@@ -1 +1 @@
-{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/tui/state.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/tui/state.ts"],"names":[],"mappings":"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"}

package/docker/docker-compose.yml

@@ -1,44 +1,84 @@
-# Camada Docker da NIO-CLI — infra local (`nio docker toolkit up`).
-#
-#  - mcp-gateway : Docker MCP Gateway (docker/mcp-gateway), transport `streaming`
-#                  em 127.0.0.1:8811/mcp. Agrega o server `docker` do catálogo
-#                  (docker/compose/swarm como tools MCP). Registrado no
-#                  `opencode.json` pelo `nio docker toolkit up` → o operador
-#                  (OpenCode/big-pickle) ganha as tools e dirige por linguagem natural.
-#  - portainer   : Portainer CE — visibilidade do gerenciamento de containers e
-#                  da stack `nio-cluster` (Swarm). 1º acesso pede setup token.
-#
-# Mesmo padrão do `kong/docker-compose.yml`: portas pinadas em 127.0.0.1,
+# Stack NIO unificado — 1 compose, 1 rede (`nio-net`), 1 stack no Portainer.
+# Substitui os 3 composes antigos (docker/ + kong/ + headroom/). O gateway agora
+# é container (Dockerfile.gateway) e o Kong o alcança por NOME na rede, sem
+# host.docker.internal. Ver docs/container-architecture.md.
+name: nio
+
+networks:
+  nio-net:
+    name: nio-net
+    driver: bridge
+
+volumes:
+  nio_portainer_data: { name: nio_portainer_data }
+  nio_headroom_cache: { name: nio_headroom_cache }
 
-# `restart: unless-stopped`, `extra_hosts` p/ Linux. Roda em qualquer Docker
-# Engine — não exige Docker Desktop.
 services:
+  nio-gateway:
+    build:
+      context: ..                       # raiz do repo (onde estão dist/ e package.json)
+      dockerfile: Dockerfile.gateway    # relativo ao context (raiz)
+    image: nio-gateway:local
+    container_name: nio-gateway
+    restart: unless-stopped
+    env_file: [ ../.env ]               # NIO_DATABASE_URL, JWT_SECRET (gitignored)
+    environment:
+      # o gateway lê env via env() que PREFIXA NIO_ → a var é NIO_GATEWAY_HOST
+      # (não GATEWAY_HOST). 0.0.0.0 = ouvir na interface da rede, não só loopback.
+      NIO_GATEWAY_HOST: "0.0.0.0"
+    ports: [ "127.0.0.1:3000:3000" ]    # acesso direto da CLI (padrão)
+    healthcheck:
+      test: ["CMD-SHELL", "curl -fsS http://localhost:3000/health || exit 1"]
+      interval: 10s
+      timeout: 3s
+      retries: 5
+      start_period: 15s
+    networks: [ nio-net ]
+
+  headroom:
+    image: ghcr.io/headroomlabs-ai/headroom@sha256:35b799e94eef4644cb15a2e695b4b99698fe7668614623e9338cb10c10ececf9  # headroom:latest, pinado 2026-09-03
+    container_name: nio-headroom
+    restart: unless-stopped
+    command: ["--host", "0.0.0.0", "--port", "8787"]
+    environment:
+      OPENAI_TARGET_API_URL: "${NIO_HEADROOM_OPENAI_TARGET:-https://opencode.ai/zen/v1}"
+      HEADROOM_UPDATE_CHECK: "off"
+    ports: [ "127.0.0.1:8787:8787" ]
+    volumes: [ "nio_headroom_cache:/root/.headroom" ]
+    networks: [ nio-net ]
+
   mcp-gateway:
-    image: docker/mcp-gateway:latest
+    image: docker/mcp-gateway@sha256:f5a679a05fc39022a046167bef92aeeb01bcd59485ad27843ae5227db7950688  # docker/mcp-gateway:latest, pinado 2026-09-03
     container_name: nio-mcp-gateway
     restart: unless-stopped
-    command:
-      - "--transport=streaming"
-      - "--port=8811"
-      - "--servers=docker"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    ports:
-      - "127.0.0.1:8811:8811"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
+    command: ["--transport=streaming", "--port=8811", "--servers=docker"]
+    ports: [ "127.0.0.1:8811:8811" ]
+    volumes: [ "/var/run/docker.sock:/var/run/docker.sock" ]
+    networks: [ nio-net ]
 
   portainer:
-    image: portainer/portainer-ce:lts
+    image: portainer/portainer-ce@sha256:511f3f06c96fe3b993ebeaafde311c1959cae73a7ef825dba6397d51b450dffa  # portainer-ce:lts, pinado 2026-09-03
     container_name: nio-portainer
     restart: unless-stopped
+    ports: [ "127.0.0.1:9443:9443" ]    # UI (edge :8000 REMOVIDO — libera p/ Kong)
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - nio_portainer_data:/data
-    ports:
-      - "127.0.0.1:9443:9443"
-      - "127.0.0.1:8000:8000"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "nio_portainer_data:/data"
+    networks: [ nio-net ]
 
-volumes:
-  nio_portainer_data:
-    name: nio_portainer_data
+  kong:
+    image: kong@sha256:2a8cf3b110cdaba1cb00adc665b8635ed1fc75c907f7a4298613c68e4976de0a  # kong:3.9, pinado 2026-09-03
+    container_name: nio-kong
+    restart: unless-stopped
+    environment:
+      KONG_DATABASE: "off"
+      KONG_DECLARATIVE_CONFIG: /kong/kong.yml
+      KONG_PROXY_LISTEN: "0.0.0.0:8000"
+      KONG_ADMIN_LISTEN: "0.0.0.0:8001"
+    volumes: [ "./kong.yml:/kong/kong.yml:ro" ]          # docker/kong.yml (T3)
+    ports:
+      - "127.0.0.1:${NIO_KONG_PROXY_PORT:-8000}:8000"    # sem colisão: Portainer largou :8000
+      - "127.0.0.1:${NIO_KONG_ADMIN_PORT:-8001}:8001"
+    depends_on:
+      nio-gateway: { condition: service_healthy }
+    networks: [ nio-net ]

package/docker/kong.yml

@@ -0,0 +1,45 @@
+# Config declarativa do Kong (DB-less). Kong entra na frente do `nio-gateway` e aplica as regras de roteamento e plugins (rate-limitng) 
+_format_version: "3.0"
+
+services:
+  - name: nio-gateway
+    url: http://nio-gateway:3000
+    routes:
+      # /login — alvo de brute-force; rate-limit apertado.
+      - name: nio-gateway-login
+        paths:
+          - /login
+        strip_path: false
+        plugins:
+          - name: rate-limiting
+            config:
+              minute: 20
+              policy: local
+      - name: nio-gateway-logout
+        paths:
+          - /logout
+        strip_path: false
+      # /verify-2fa e /security/* — OTP + gerência do 2º fator (spec 0004).
+      # cada SMS custa; brute-force de OTP de 6 dígitos → limite mais baixo.
+      - name: nio-gateway-verify-2fa
+        paths:
+          - /verify-2fa
+        strip_path: false
+        plugins:
+          - name: rate-limiting
+            config:
+              minute: 10
+              policy: local
+      - name: nio-gateway-security
+        paths:
+          - /security
+        strip_path: false
+        plugins:
+          - name: rate-limiting
+            config:
+              minute: 10
+              policy: local
+      - name: nio-gateway-health
+        paths:
+          - /health
+        strip_path: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nio-cli/cli",
-  "version": "0.3.0",
+  "version": "0.3.4",
   "description": "Orquestrador de ambientes de desenvolvimento: escolhe um perfil, responde um wizard e a CLI (com auxílio de IA via MCP) materializa toolchains, linguagens, frameworks, dotfiles e IDE.",
   "type": "module",
   "license": "UNLICENSED",
@@ -13,7 +13,9 @@
   "files": [
     "dist",
     "docker/docker-compose.yml",
-    "headroom/docker-compose.yml",
+    "docker/kong.yml",
+    "Dockerfile.gateway",
+    ".env.example",
     "README.md"
   ],
   "engines": {
@@ -45,7 +47,7 @@
     "nio"
   ],
   "scripts": {
-    "build": "rm -rf dist && tsc && node --input-type=commonjs -e \"require('fs').cpSync('src/cli/copy','dist/cli/copy',{recursive:true})\" && chmod +x dist/cli.js dist/mcp-server.js dist/gateway/index.js dist/mcp-server-lang.js",
+    "build": "rm -rf dist && tsc && node --input-type=commonjs -e \"const fs=require('fs');fs.cpSync('src/cli/copy','dist/cli/copy',{recursive:true});for(const f of ['cli.js','mcp-server.js','gateway/index.js','mcp-server-lang.js'])fs.chmodSync('dist/'+f,0o755)\"",
     "gen:docs": "bun run scripts/gen-reference.ts",
     "db:ping": "bun run scripts/db-ping.ts",
     "dev:sms-echo": "bun run scripts/sms-echo.ts",
@@ -53,9 +55,7 @@
     "dev:mcp": "bun run src/mcp-server.ts",
     "dev:gateway": "bun run src/gateway/index.ts",
     "dev:lang": "bun run src/mcp-server-lang.ts",
-    "dev:kong": "docker compose -f kong/docker-compose.yml --env-file .env up",
-    "dev:docker": "docker compose -f docker/docker-compose.yml up",
-    "dev:headroom": "docker compose -f headroom/docker-compose.yml up",
+    "dev:docker": "docker compose -f docker/docker-compose.yml up --build",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {

package/headroom/docker-compose.yml

@@ -1,27 +0,0 @@
-# Headroom — proxy de compressão de contexto entre o client de IA e o LLM.
-# Obrigatório pro `nio ai` (ADR 0007). Mesmo padrão do `docker/docker-compose.yml`:
-# porta pinada em 127.0.0.1, `restart: unless-stopped`, `extra_hosts` p/ Linux.
-#
-# O entrypoint da imagem já é `headroom proxy` — `command` passa só flags.
-# `OPENAI_TARGET_API_URL` roteia as chamadas OpenAI-compatíveis (o operador usa
-# OpenCode Zen) pro Zen; o header Authorization do OpenCode passa transparente,
-# então o Headroom não precisa de API key própria.
-services:
-  headroom:
-    image: ghcr.io/headroomlabs-ai/headroom:latest
-    container_name: nio-headroom
-    restart: unless-stopped
-    command: ["--host", "0.0.0.0", "--port", "8787"]
-    environment:
-      OPENAI_TARGET_API_URL: "${NIO_HEADROOM_OPENAI_TARGET:-https://opencode.ai/zen/v1}"
-      HEADROOM_UPDATE_CHECK: "off"
-    ports:
-      - "127.0.0.1:${NIO_HEADROOM_PORT:-8787}:8787"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    volumes:
-      - nio_headroom_cache:/root/.headroom
-
-volumes:
-  nio_headroom_cache:
-    name: nio_headroom_cache