rootkid0-initializer 0.1.0 → 0.1.2

package/.opencode/mcp/README.md

@@ -21,13 +21,17 @@ Configura todos los servidores MCP en esta carpeta para evitar definiciones dupl
 
 ## Requisito para init automatico de Notion
 
-El bootstrap del proyecto valida este archivo global:
+El bootstrap del proyecto asume que MCP Notion ya esta preinstalado/configurado por el usuario.
+El initializer NO instala ni modifica MCP global.
 
-- `~/.config/opencode/mcp-servers.json`
+Validacion minima del bootstrap:
+
+- `~/.config/opencode/opencode.json` (preferido)
+- `~/.config/opencode/mcp-servers.json` (legacy)
 
 Condicion minima requerida:
 
-- Debe existir entrada `servers.notion`.
+- Debe existir entrada `notion` en el archivo global usado.
 
 Si falta, el init falla con mensaje de correccion porque el setup Notion es automatico en P1.
 

package/README.md

@@ -44,51 +44,44 @@ Cada subproyecto trabaja con su `AGENTS.md` local y su `skills/` local.
 
 ### NPX (recomendado)
 
-```bash
-npx rootkid0-initializer my-project
-
-# Opcional: configurar MCP global baseline
-npx rootkid0-initializer --setup-mcp my-project
-```
+```bash
+npx rootkid0-initializer my-project
+```
 
 ### Uso directo de scripts (fallback)
 
 #### Bash
 
-```bash
+```bash
 chmod +x rootkid0-bootstrap/init-project.sh
 ./rootkid0-bootstrap/init-project.sh my-project
-
-# Opcional: configurar MCP global baseline
-./rootkid0-bootstrap/init-project.sh --setup-mcp my-project
-```
+```
 
 #### PowerShell
 
-```powershell
+```powershell
 ./rootkid0-bootstrap/init-project.ps1 my-project
-
-# Opcional: configurar MCP global baseline
-./rootkid0-bootstrap/init-project.ps1 -SetupMcp my-project
-```
+```
 
 El script crea una carpeta nueva con la estructura actual del repositorio, excluye `rootkid0-bootstrap/` y `automation/`, reemplaza `{{PROJECT_NAME}}`, mantiene `AGENTS.md`, genera un README inicial y ejecuta bootstrap automatico de Notion.
 
 ## Setup automatico de Notion (MVP)
 
-El init ejecuta bootstrap Notion automaticamente despues de crear el proyecto. Requisitos obligatorios:
-
-- MCP global en `~/.config/opencode/mcp-servers.json`.
-- Entrada `servers.notion` presente en ese archivo.
-- Variables de entorno:
-  - `NOTION_TOKEN` (obligatoria)
-  - `NOTION_PARENT_PAGE_ID` (obligatoria)
-  - `NOTION_WORKSPACE_NAME` (opcional)
+El init ejecuta bootstrap Notion automaticamente despues de crear el proyecto. Requisitos obligatorios:
+
+- MCP Notion preinstalado/configurado por el usuario (el initializer no instala ni modifica MCP global).
+- Archivo global `~/.config/opencode/opencode.json` (preferido) o `~/.config/opencode/mcp-servers.json` (legacy), con entrada `notion`.
+- Credencial de Notion resuelta desde MCP Notion (o `NOTION_TOKEN` si la defines manualmente).
+- Variables opcionales:
+  - `NOTION_PARENT_PAGE_ID` (recomendado para crear bajo una raiz definida)
+  - `NOTION_WORKSPACE_NAME` (opcional)
 
 Resultado del bootstrap:
 
-- Crea pagina raiz del proyecto en Notion.
-- Crea paginas por fase: `01-business` a `07-production` y `99-common`.
+- Crea pagina raiz del proyecto en Notion.
+- Si existe `NOTION_PARENT_PAGE_ID`, crea la pagina raiz como hija de ese parent.
+- Si no existe `NOTION_PARENT_PAGE_ID`, crea la pagina raiz a nivel workspace del usuario.
+- Crea paginas por fase: `01-business` a `07-production` y `99-common`.
 - Crea secciones placeholder del modelo multi-DB: `Projects`, `Phases`, `Deliverables`, `Backlog`, `Risks`, `Decisions`, `Incidents`.
 - Guarda IDs generados en `99-common/notion-bootstrap.output.json` dentro del proyecto creado.
 

package/bin/rootkid0-initializer.js

@@ -1,19 +1,17 @@
 #!/usr/bin/env node
 
-const { spawnSync } = require("node:child_process");
-const path = require("node:path");
-
-const argv = process.argv.slice(2);
-let projectName = "";
-let setupMcp = false;
-
-function printHelp() {
-  console.log("Uso: rootkid0-initializer [--setup-mcp] <project-name>");
-  console.log("");
-  console.log("Ejemplos:");
-  console.log("  npx rootkid0-initializer my-project");
-  console.log("  npx rootkid0-initializer --setup-mcp my-project");
-}
+const { spawnSync } = require("node:child_process");
+const path = require("node:path");
+
+const argv = process.argv.slice(2);
+let projectName = "";
+
+function printHelp() {
+  console.log("Uso: rootkid0-initializer <project-name>");
+  console.log("");
+  console.log("Ejemplos:");
+  console.log("  npx rootkid0-initializer my-project");
+}
 
 for (const arg of argv) {
   if (arg === "-h" || arg === "--help") {
@@ -21,15 +19,10 @@ for (const arg of argv) {
     process.exit(0);
   }
 
-  if (arg === "--setup-mcp") {
-    setupMcp = true;
-    continue;
-  }
-
-  if (arg.startsWith("-")) {
-    console.error(`Error: opcion no reconocida '${arg}'`);
-    printHelp();
-    process.exit(1);
+  if (arg.startsWith("-")) {
+    console.error(`Error: opcion no reconocida '${arg}'`);
+    printHelp();
+    process.exit(1);
   }
 
   if (!projectName) {
@@ -46,31 +39,23 @@ const packageRoot = path.resolve(__dirname, "..");
 let command = "";
 let commandArgs = [];
 
-if (process.platform === "win32") {
+if (process.platform === "win32") {
   const psScript = path.join(packageRoot, "rootkid0-bootstrap", "init-project.ps1");
-  command = "powershell";
-  commandArgs = ["-NoProfile", "-ExecutionPolicy", "Bypass", "-File", psScript];
-
-  if (setupMcp) {
-    commandArgs.push("-SetupMcp");
-  }
-
-  if (projectName) {
-    commandArgs.push(projectName);
-  }
-} else {
+  command = "powershell";
+  commandArgs = ["-NoProfile", "-ExecutionPolicy", "Bypass", "-File", psScript];
+
+  if (projectName) {
+    commandArgs.push(projectName);
+  }
+} else {
   const shScript = path.join(packageRoot, "rootkid0-bootstrap", "init-project.sh");
-  command = "bash";
-  commandArgs = [shScript];
-
-  if (setupMcp) {
-    commandArgs.push("--setup-mcp");
-  }
-
-  if (projectName) {
-    commandArgs.push(projectName);
-  }
-}
+  command = "bash";
+  commandArgs = [shScript];
+
+  if (projectName) {
+    commandArgs.push(projectName);
+  }
+}
 
 const result = spawnSync(command, commandArgs, {
   stdio: "inherit",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rootkid0-initializer",
-  "version": "0.1.0",
-  "description": "CLI para inicializar proyectos rootkid0 sin subcomando init.",
+  "version": "0.1.2",
+  "description": "CLI para inicializar el flujo de  proyectos al estilo rootkid0.",
   "license": "MIT",
   "type": "commonjs",
   "bin": {
@@ -9,7 +9,7 @@
   },
   "files": [
     "bin/",
-    "rootkid0-bootstrap/",
+    "rootkid0-bootstrap/",
     ".opencode/",
     "01-business/",
     "02-proposal/",

package/rootkid0-bootstrap/helpers.sh

@@ -49,33 +49,7 @@ replace_project_placeholders() {
   done < <(find "$destination" -type f \( -name "*.md" -o -name "*.txt" -o -name "*.json" -o -name "*.yml" -o -name "*.yaml" -o -name "*.ini" -o -name "*.cfg" \) -print0)
 }
 
-setup_global_mcp_config() {
-  local repo_root="$1"
-  local template_file="$repo_root/.opencode/mcp/servers.template.json"
-  local target_dir="$HOME/.config/opencode"
-  local target_file="$target_dir/mcp-servers.json"
-  local backup_file
-
-  if [[ ! -f "$template_file" ]]; then
-    echo "Aviso: No se encontro $template_file. Se omite setup MCP." >&2
-    return 0
-  fi
-
-  mkdir -p "$target_dir"
-
-  if [[ -f "$target_file" ]]; then
-    backup_file="$target_file.bak.$(date +%Y%m%d%H%M%S)"
-    cp "$target_file" "$backup_file"
-    echo "Backup MCP creado: $backup_file"
-  fi
-
-  cp "$template_file" "$target_file"
-  echo "MCP global actualizado: $target_file"
-  echo "Recomendado: configurar context7, engram y notion usando:"
-  echo "  $repo_root/.opencode/mcp/servers.recommended.template.json"
-}
-
-generate_project_readme() {
+generate_project_readme() {
   local destination="$1"
   local project_name="$2"
 
@@ -90,7 +64,7 @@ Proyecto inicializado desde rootkid0-initializer.
 - Plantillas markdown con placeholders ya resueltos para tu proyecto.
 - Configuracion inicial en \`99-common/project.config.json\`.
 - Integracion OpenCode MVP (\`AGENTS.md\`, \`.opencode/\`, AGENTS locales, skills, MCP y agentes por rol).
-- Setup automatico de Notion (MVP): pagina raiz, fases y secciones del modelo multi-DB.
+- Setup automatico de Notion (MVP): usa MCP Notion preconfigurado por el usuario.
 - Salida de IDs Notion en \`99-common/notion-bootstrap.output.json\`.
 
 ## Siguientes pasos
@@ -99,7 +73,7 @@ Proyecto inicializado desde rootkid0-initializer.
 2. Ajusta \`99-common/project.config.json\` segun tu stack y contexto.
 3. Revisa \`AGENTS.md\` como entrypoint de roles.
 4. Revisa \`.opencode/README.md\` para el flujo global + subproyectos.
-5. Revisa \`.opencode/mcp/README.md\` para prerequisitos MCP + Notion.
+5. Confirma prerequisito MCP Notion (preinstalado/configurado) en \`.opencode/mcp/README.md\`.
 6. Verifica \`99-common/notion-bootstrap.output.json\`.
 7. Versiona cambios con Git y define tu backlog inicial.
 EOF

package/rootkid0-bootstrap/init-project.ps1

@@ -1,7 +1,6 @@
 param(
   [Parameter(Position = 0)]
-  [string]$ProjectName,
-  [switch]$SetupMcp
+  [string]$ProjectName
 )
 
 Set-StrictMode -Version Latest
@@ -45,36 +44,6 @@ Get-ChildItem -Path $destination -Recurse -File |
     }
   }
 
-$templatePath = Join-Path $repoRoot ".opencode/mcp/servers.template.json"
-$recommendedPath = Join-Path $repoRoot ".opencode/mcp/servers.recommended.template.json"
-
-if ($SetupMcp) {
-  if (Test-Path $templatePath) {
-    $globalMcpDir = Join-Path $HOME ".config/opencode"
-    $globalMcpFile = Join-Path $globalMcpDir "mcp-servers.json"
-
-    New-Item -Path $globalMcpDir -ItemType Directory -Force | Out-Null
-
-    if (Test-Path $globalMcpFile) {
-      $stamp = Get-Date -Format "yyyyMMddHHmmss"
-      $backupPath = "$globalMcpFile.bak.$stamp"
-      Copy-Item -Path $globalMcpFile -Destination $backupPath -Force
-      Write-Host "Backup MCP creado: $backupPath"
-    }
-
-    Copy-Item -Path $templatePath -Destination $globalMcpFile -Force
-    Write-Host "MCP global actualizado: $globalMcpFile"
-
-    if (Test-Path $recommendedPath) {
-      Write-Host "Recomendado: configurar context7, engram y notion usando:"
-      Write-Host "  $recommendedPath"
-    }
-  }
-  else {
-    Write-Warning "No se encontro plantilla MCP en $templatePath. Se omite setup MCP."
-  }
-}
-
 & (Join-Path $scriptDir "notion-bootstrap.ps1") -ProjectName $ProjectName -ProjectDir $destination
 
 $readmePath = Join-Path $destination "README.md"
@@ -89,7 +58,7 @@ Proyecto inicializado desde rootkid0-initializer.
 - Plantillas markdown con placeholders ya resueltos para tu proyecto.
 - Configuracion inicial en `99-common/project.config.json`.
 - Integracion OpenCode MVP (`AGENTS.md`, `.opencode/`, AGENTS locales, skills, MCP y agentes por rol).
-- Setup automatico de Notion (MVP): pagina raiz, fases y secciones del modelo multi-DB.
+- Setup automatico de Notion (MVP): usa MCP Notion preconfigurado por el usuario.
 - Salida de IDs Notion en `99-common/notion-bootstrap.output.json`.
 
 ## Siguientes pasos
@@ -98,7 +67,7 @@ Proyecto inicializado desde rootkid0-initializer.
 2. Ajusta `99-common/project.config.json` segun tu stack y contexto.
 3. Revisa `AGENTS.md` como entrypoint de roles.
 4. Revisa `.opencode/README.md` para el flujo global + subproyectos.
-5. Revisa `.opencode/mcp/README.md` para prerequisitos MCP + Notion.
+5. Confirma prerequisito MCP Notion (preinstalado/configurado) en `.opencode/mcp/README.md`.
 6. Verifica `99-common/notion-bootstrap.output.json`.
 7. Versiona cambios con Git y define tu backlog inicial.
 "@

package/rootkid0-bootstrap/init-project.sh

@@ -8,17 +8,13 @@ REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 source "$SCRIPT_DIR/helpers.sh"
 
 print_usage() {
-  echo "Uso: ./rootkid0-bootstrap/init-project.sh [--setup-mcp] <project-name>"
+  echo "Uso: ./rootkid0-bootstrap/init-project.sh <project-name>"
 }
 
-SETUP_MCP=false
 PROJECT_NAME=""
 
 for arg in "$@"; do
   case "$arg" in
-    --setup-mcp)
-      SETUP_MCP=true
-      ;;
     -h|--help)
       print_usage
       exit 0
@@ -55,10 +51,6 @@ copy_baseline "$REPO_ROOT" "$DESTINATION"
 replace_project_placeholders "$DESTINATION" "$PROJECT_NAME"
 generate_project_readme "$DESTINATION" "$PROJECT_NAME"
 
-if [[ "$SETUP_MCP" == "true" ]]; then
-  setup_global_mcp_config "$REPO_ROOT"
-fi
-
 bash "$SCRIPT_DIR/notion-bootstrap.sh" --project-name "$PROJECT_NAME" --project-dir "$DESTINATION"
 
 echo

package/rootkid0-bootstrap/notion-bootstrap.ps1

@@ -20,30 +20,119 @@ function Require-Env([string]$Name) {
   }
 }
 
-function Get-NotionPagePayload([string]$ParentPageId, [string]$Title) {
-  return @{
-    parent = @{ page_id = $ParentPageId }
-    properties = @{
-      title = @{
-        title = @(
-          @{
-            type = "text"
-            text = @{ content = $Title }
-          }
-        )
+function Resolve-NotionToken([string]$McpFile) {
+  $token = [Environment]::GetEnvironmentVariable("NOTION_TOKEN")
+  if (-not [string]::IsNullOrWhiteSpace($token)) {
+    return $token
+  }
+
+  try {
+    $raw = Get-Content -Path $McpFile -Raw | ConvertFrom-Json
+    if ($null -ne $raw.servers) {
+      $fromConfig = $raw.servers.notion.env.NOTION_TOKEN
+    }
+    elseif ($null -ne $raw.mcp -and $null -ne $raw.mcp.servers) {
+      $fromConfig = $raw.mcp.servers.notion.env.NOTION_TOKEN
+    }
+    else {
+      $fromConfig = ""
+    }
+  }
+  catch {
+    $fromConfig = ""
+  }
+
+  if ($fromConfig -is [string]) {
+    if ($fromConfig -match '^\$\{(.+)\}$') {
+      $refVar = $Matches[1]
+      $resolved = [Environment]::GetEnvironmentVariable($refVar)
+      if (-not [string]::IsNullOrWhiteSpace($resolved)) {
+        return $resolved
       }
     }
-  } | ConvertTo-Json -Depth 10
+    elseif (-not [string]::IsNullOrWhiteSpace($fromConfig)) {
+      return $fromConfig
+    }
+  }
+
+  Fail "No se pudo resolver credencial de Notion. Define NOTION_TOKEN o configura servers.notion.env.NOTION_TOKEN en $McpFile."
 }
 
-function New-NotionPage([string]$ParentPageId, [string]$Title) {
+function Resolve-McpConfigFile() {
+  $opencodeFile = Join-Path $HOME ".config/opencode/opencode.json"
+  $legacyFile = Join-Path $HOME ".config/opencode/mcp-servers.json"
+
+  if (Test-Path -LiteralPath $opencodeFile) {
+    return $opencodeFile
+  }
+
+  if (Test-Path -LiteralPath $legacyFile) {
+    return $legacyFile
+  }
+
+  Fail "Prerequisito faltante: MCP Notion no disponible. Debe existir $opencodeFile (preferido) o $legacyFile con entrada notion antes de ejecutar init-project."
+}
+
+function Has-NotionServer([string]$McpFile) {
+  try {
+    $raw = Get-Content -Path $McpFile -Raw | ConvertFrom-Json
+    if ($null -ne $raw.servers -and $null -ne $raw.servers.notion) {
+      return $true
+    }
+    if ($null -ne $raw.mcp -and $null -ne $raw.mcp.servers -and $null -ne $raw.mcp.servers.notion) {
+      return $true
+    }
+    return $false
+  }
+  catch {
+    return $false
+  }
+}
+
+function Get-NotionPagePayload([string]$ParentMode, [string]$ParentValue, [string]$Title) {
+  if ($ParentMode -eq "page") {
+    return @{
+      parent = @{ page_id = $ParentValue }
+      properties = @{
+        title = @{
+          title = @(
+            @{
+              type = "text"
+              text = @{ content = $Title }
+            }
+          )
+        }
+      }
+    } | ConvertTo-Json -Depth 10
+  }
+
+  if ($ParentMode -eq "workspace") {
+    return @{
+      parent = @{ workspace = $true }
+      properties = @{
+        title = @{
+          title = @(
+            @{
+              type = "text"
+              text = @{ content = $Title }
+            }
+          )
+        }
+      }
+    } | ConvertTo-Json -Depth 10
+  }
+
+  Fail "Modo de parent no soportado para Notion payload: $ParentMode"
+}
+
+function New-NotionPage([string]$ParentMode, [string]$ParentValue, [string]$Title) {
   $headers = @{
-    Authorization    = "Bearer $env:NOTION_TOKEN"
+    Authorization    = "Bearer $script:NotionToken"
     "Notion-Version" = "2022-06-28"
     "Content-Type"   = "application/json"
   }
 
-  $body = Get-NotionPagePayload -ParentPageId $ParentPageId -Title $Title
+  $body = Get-NotionPagePayload -ParentMode $ParentMode -ParentValue $ParentValue -Title $Title
 
   try {
     $response = Invoke-RestMethod -Method Post -Uri "https://api.notion.com/v1/pages" -Headers $headers -Body $body
@@ -67,27 +156,16 @@ if (-not (Test-Path -LiteralPath $ProjectDir)) {
   Fail "No existe el directorio de proyecto: $ProjectDir"
 }
 
-$mcpFile = Join-Path $HOME ".config/opencode/mcp-servers.json"
-
-if (-not (Test-Path -LiteralPath $mcpFile)) {
-  Fail "No existe $mcpFile. Configura MCP global con servidor notion y vuelve a ejecutar init-project."
-}
+$mcpFile = Resolve-McpConfigFile
 
-try {
-  $mcpConfig = Get-Content -Path $mcpFile -Raw | ConvertFrom-Json
-}
-catch {
-  Fail "El archivo $mcpFile no tiene JSON valido. Corrigelo y vuelve a ejecutar init-project."
+if (-not (Has-NotionServer -McpFile $mcpFile)) {
+  Fail "Prerequisito faltante: MCP Notion no disponible. Agrega entrada notion en $mcpFile y vuelve a ejecutar init-project."
 }
 
-if ($null -eq $mcpConfig.servers -or $null -eq $mcpConfig.servers.notion) {
-  Fail "Falta entrada servers.notion en $mcpFile. Agregala y vuelve a ejecutar init-project."
-}
-
-Require-Env "NOTION_TOKEN"
-Require-Env "NOTION_PARENT_PAGE_ID"
+$script:NotionToken = Resolve-NotionToken -McpFile $mcpFile
 
 $workspaceName = [Environment]::GetEnvironmentVariable("NOTION_WORKSPACE_NAME")
+$parentPageId = [Environment]::GetEnvironmentVariable("NOTION_PARENT_PAGE_ID")
 
 Write-Host "Iniciando bootstrap automatico de Notion..."
 
@@ -96,7 +174,19 @@ if (-not [string]::IsNullOrWhiteSpace($workspaceName)) {
   $rootTitle = "$workspaceName - $ProjectName"
 }
 
-$projectRootPageId = New-NotionPage -ParentPageId $env:NOTION_PARENT_PAGE_ID -Title $rootTitle
+$parentMode = "workspace"
+$parentValue = ""
+
+if (-not [string]::IsNullOrWhiteSpace($parentPageId)) {
+  $parentMode = "page"
+  $parentValue = $parentPageId
+  Write-Host "Modo parent Notion: page ($parentPageId)"
+}
+else {
+  Write-Host "Modo parent Notion: workspace (NOTION_PARENT_PAGE_ID no definido)"
+}
+
+$projectRootPageId = New-NotionPage -ParentMode $parentMode -ParentValue $parentValue -Title $rootTitle
 Write-Host "Pagina raiz creada: $projectRootPageId"
 
 $phaseNames = @(
@@ -114,7 +204,7 @@ $phaseMap = [ordered]@{}
 $commonPageId = ""
 
 foreach ($phase in $phaseNames) {
-  $phaseId = New-NotionPage -ParentPageId $projectRootPageId -Title $phase
+  $phaseId = New-NotionPage -ParentMode "page" -ParentValue $projectRootPageId -Title $phase
   $phaseMap[$phase] = $phaseId
   Write-Host "Pagina creada ($phase): $phaseId"
   if ($phase -eq "99-common") {
@@ -139,7 +229,7 @@ $sectionNames = @(
 $sectionMap = [ordered]@{}
 
 foreach ($section in $sectionNames) {
-  $sectionId = New-NotionPage -ParentPageId $commonPageId -Title $section
+  $sectionId = New-NotionPage -ParentMode "page" -ParentValue $commonPageId -Title $section
   $sectionMap[$section] = $sectionId
   Write-Host "Seccion modelo MVP creada ($section): $sectionId"
 }
@@ -150,7 +240,8 @@ $result = [ordered]@{
   project_name = $ProjectName
   workspace_name = $workspaceName
   created_at_utc = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
-  notion_parent_page_id = $env:NOTION_PARENT_PAGE_ID
+  notion_parent_mode = $parentMode
+  notion_parent_page_id = $parentPageId
   project_root_page_id = $projectRootPageId
   phase_pages = $phaseMap
   model_sections = $sectionMap

package/rootkid0-bootstrap/notion-bootstrap.sh

@@ -35,57 +35,39 @@ pick_python() {
 }
 
 validate_mcp_config() {
-  local mcp_file="$HOME/.config/opencode/mcp-servers.json"
+  local mcp_file="$1"
   local py_bin
-  local py_status
+  local has_notion=""
 
   if [[ ! -f "$mcp_file" ]]; then
-    fail "No existe $mcp_file. Configura el MCP global con entrada 'notion' y vuelve a ejecutar init-project."
+    fail "Prerequisito faltante: MCP Notion no disponible. Debe existir $mcp_file con entrada notion antes de ejecutar init-project."
   fi
 
   py_bin="$(pick_python || true)"
-
   if [[ -n "$py_bin" ]]; then
-    if "$py_bin" - "$mcp_file" <<'PY'; then
+    has_notion="$($py_bin - "$mcp_file" <<'PY'
 import json
 import sys
 
-path = sys.argv[1]
-try:
-    with open(path, "r", encoding="utf-8") as f:
-        data = json.load(f)
-except Exception:
-    sys.exit(2)
+with open(sys.argv[1], "r", encoding="utf-8") as f:
+    data = json.load(f)
 
-servers = data.get("servers")
-if isinstance(servers, dict) and "notion" in servers:
-    sys.exit(0)
+servers = {}
+if isinstance(data, dict):
+    if isinstance(data.get("servers"), dict):
+        servers = data.get("servers", {})
+    elif isinstance(data.get("mcp"), dict) and isinstance(data["mcp"].get("servers"), dict):
+        servers = data["mcp"]["servers"]
 
-sys.exit(1)
+print("yes" if "notion" in servers else "no")
 PY
-      py_status=0
-    else
-      py_status=$?
-    fi
-
-    if [[ "$py_status" -ne 0 ]]; then
-      case "$py_status" in
-        1)
-          fail "Falta el servidor 'notion' en $mcp_file. Agrega la entrada en servers.notion y vuelve a ejecutar init-project."
-          ;;
-        2)
-          fail "El archivo $mcp_file no tiene JSON valido. Corrigelo y vuelve a ejecutar init-project."
-          ;;
-        *)
-          fail "No se pudo validar $mcp_file. Verifica permisos y formato del archivo."
-          ;;
-      esac
-    fi
-    return 0
+)"
+  else
+    has_notion="$(grep -q '"notion"' "$mcp_file" && echo yes || echo no)"
   fi
 
-  if ! grep -q '"notion"' "$mcp_file"; then
-    fail "No se detecto la entrada 'notion' en $mcp_file. Agrega el servidor notion y vuelve a ejecutar init-project."
+  if [[ "$has_notion" != "yes" ]]; then
+    fail "Prerequisito faltante: MCP Notion no disponible. Agrega la entrada notion en $mcp_file y vuelve a ejecutar init-project."
   fi
 }
 
@@ -105,30 +87,113 @@ require_command() {
   fi
 }
 
+resolve_notion_token() {
+  local mcp_file="$1"
+  local token="${NOTION_TOKEN:-}"
+  local py_bin
+
+  if [[ -n "$token" ]]; then
+    printf '%s' "$token"
+    return 0
+  fi
+
+  py_bin="$(pick_python || true)"
+  if [[ -n "$py_bin" ]]; then
+    token="$($py_bin - "$mcp_file" <<'PY'
+import json
+import os
+import re
+import sys
+
+with open(sys.argv[1], "r", encoding="utf-8") as f:
+    data = json.load(f)
+
+value = ""
+servers = {}
+if isinstance(data, dict):
+    if isinstance(data.get("servers"), dict):
+        servers = data.get("servers", {})
+    elif isinstance(data.get("mcp"), dict) and isinstance(data["mcp"].get("servers"), dict):
+        servers = data["mcp"]["servers"]
+
+notion = servers.get("notion", {}) if isinstance(servers, dict) else {}
+env = notion.get("env", {}) if isinstance(notion, dict) else {}
+
+if isinstance(env, dict):
+    raw = env.get("NOTION_TOKEN", "")
+    if isinstance(raw, str):
+        match = re.fullmatch(r"\$\{([^}]+)\}", raw.strip())
+        if match:
+            value = os.environ.get(match.group(1), "")
+        else:
+            value = raw
+
+print(value)
+PY
+)"
+  fi
+
+  if [[ -z "$token" ]]; then
+    fail "No se pudo resolver credencial de Notion. Define NOTION_TOKEN o configura servers.notion.env.NOTION_TOKEN en $mcp_file."
+  fi
+
+  printf '%s' "$token"
+}
+
+resolve_mcp_config_file() {
+  local opencode_file="$HOME/.config/opencode/opencode.json"
+  local legacy_file="$HOME/.config/opencode/mcp-servers.json"
+
+  if [[ -f "$opencode_file" ]]; then
+    printf '%s' "$opencode_file"
+    return 0
+  fi
+
+  if [[ -f "$legacy_file" ]]; then
+    printf '%s' "$legacy_file"
+    return 0
+  fi
+
+  fail "Prerequisito faltante: MCP Notion no disponible. Debe existir $opencode_file (preferido) o $legacy_file con entrada notion antes de ejecutar init-project."
+}
+
 build_page_payload() {
-  local parent_id="$1"
-  local title="$2"
+  local parent_mode="$1"
+  local parent_value="$2"
+  local title="$3"
+
+  if [[ "$parent_mode" == "page" ]]; then
+    printf '{"parent":{"page_id":"%s"},"properties":{"title":{"title":[{"type":"text","text":{"content":"%s"}}]}}}' \
+      "$parent_value" \
+      "$(json_escape "$title")"
+    return 0
+  fi
 
-  printf '{"parent":{"page_id":"%s"},"properties":{"title":{"title":[{"type":"text","text":{"content":"%s"}}]}}}' \
-    "$parent_id" \
-    "$(json_escape "$title")"
+  if [[ "$parent_mode" == "workspace" ]]; then
+    printf '{"parent":{"workspace":true},"properties":{"title":{"title":[{"type":"text","text":{"content":"%s"}}]}}}' \
+      "$(json_escape "$title")"
+    return 0
+  fi
+
+  fail "Modo de parent no soportado para Notion payload: $parent_mode"
 }
 
 create_notion_page() {
-  local parent_id="$1"
-  local title="$2"
+  local parent_mode="$1"
+  local parent_value="$2"
+  local title="$3"
   local payload
   local response_file
   local status
   local py_bin
   local page_id
 
-  payload="$(build_page_payload "$parent_id" "$title")"
+  payload="$(build_page_payload "$parent_mode" "$parent_value" "$title")"
   response_file="$(mktemp)"
 
   status="$(curl -sS -o "$response_file" -w "%{http_code}" \
     -X POST "https://api.notion.com/v1/pages" \
-    -H "Authorization: Bearer $NOTION_TOKEN" \
+    -H "Authorization: Bearer $NOTION_AUTH_TOKEN" \
     -H "Notion-Version: 2022-06-28" \
     -H "Content-Type: application/json" \
     --data "$payload")"
@@ -197,12 +262,13 @@ if [[ ! -d "$PROJECT_DIR" ]]; then
   fail "No existe el directorio de proyecto: $PROJECT_DIR"
 fi
 
-validate_mcp_config
+mcp_config_file="$(resolve_mcp_config_file)"
+validate_mcp_config "$mcp_config_file"
 require_command "curl"
-require_env "NOTION_TOKEN"
-require_env "NOTION_PARENT_PAGE_ID"
+NOTION_AUTH_TOKEN="$(resolve_notion_token "$mcp_config_file")"
 
 NOTION_WORKSPACE_NAME="${NOTION_WORKSPACE_NAME:-}"
+NOTION_PARENT_PAGE_ID="${NOTION_PARENT_PAGE_ID:-}"
 
 echo "Iniciando bootstrap automatico de Notion..."
 
@@ -211,7 +277,18 @@ if [[ -n "$NOTION_WORKSPACE_NAME" ]]; then
   root_title="$NOTION_WORKSPACE_NAME - $PROJECT_NAME"
 fi
 
-project_root_page_id="$(create_notion_page "$NOTION_PARENT_PAGE_ID" "$root_title")"
+parent_mode="workspace"
+parent_value=""
+
+if [[ -n "$NOTION_PARENT_PAGE_ID" ]]; then
+  parent_mode="page"
+  parent_value="$NOTION_PARENT_PAGE_ID"
+  echo "Modo parent Notion: page ($NOTION_PARENT_PAGE_ID)"
+else
+  echo "Modo parent Notion: workspace (NOTION_PARENT_PAGE_ID no definido)"
+fi
+
+project_root_page_id="$(create_notion_page "$parent_mode" "$parent_value" "$root_title")"
 echo "Pagina raiz creada: $project_root_page_id"
 
 phase_names=(
@@ -229,7 +306,7 @@ phase_ids=()
 common_page_id=""
 
 for phase in "${phase_names[@]}"; do
-  phase_id="$(create_notion_page "$project_root_page_id" "$phase")"
+  phase_id="$(create_notion_page "page" "$project_root_page_id" "$phase")"
   phase_ids+=("$phase_id")
   echo "Pagina creada ($phase): $phase_id"
   if [[ "$phase" == "99-common" ]]; then
@@ -253,7 +330,7 @@ section_names=(
 
 section_ids=()
 for section in "${section_names[@]}"; do
-  section_id="$(create_notion_page "$common_page_id" "$section")"
+  section_id="$(create_notion_page "page" "$common_page_id" "$section")"
   section_ids+=("$section_id")
   echo "Seccion modelo MVP creada ($section): $section_id"
 done
@@ -266,6 +343,7 @@ timestamp_utc="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
   echo "  \"project_name\": \"$(json_escape "$PROJECT_NAME")\","
   echo "  \"workspace_name\": \"$(json_escape "$NOTION_WORKSPACE_NAME")\","
   echo "  \"created_at_utc\": \"$timestamp_utc\","
+  echo "  \"notion_parent_mode\": \"$parent_mode\","
   echo "  \"notion_parent_page_id\": \"$(json_escape "$NOTION_PARENT_PAGE_ID")\","
   echo "  \"project_root_page_id\": \"$project_root_page_id\","
   echo "  \"phase_pages\": {"