direxio-deployer 0.1.3 → 0.1.5

package/README.md

@@ -19,14 +19,14 @@
 
 ## Skill Installation And Updates
 
-Install the deployer skill from npm, then place it into the current agent runtime's skill directory. Project-local installs are preferred because they keep the deployment skill scoped to the workspace that uses it.
+Install the deployer skill from npm, then place it into the current agent runtime's skill directory. The default install is global for the selected agent runtime. Use a project-local install only when you explicitly want the skill copied into a specific repository or workspace.
 
 The GitHub repository keeps tests for maintainers and CI, but the published npm package and installed skill copy exclude `tests/` to keep user installs small.
 
-If you want Codex to install and deploy in one instruction, do not say "install skills <GitHub URL>". That triggers GitHub skill installation and can place the skill in the global `~/.codex` directory. Use a short instruction that tells the agent to read this README's npm/project-local install rule:
+If you want Codex to install and deploy in one instruction, do not say "install skills <GitHub URL>". That triggers GitHub skill installation instead of the npm-managed installer. Use a short instruction that gives the repository address for reading only and tells the agent to follow the README's npm install rule:
 
 ```text
-Follow the direxio-deployer README npm/project-local install rule, then deploy Direxio with domain __DOMAIN__.
+Read https://github.com/YingSuiAI/direxio-deployer README and follow its npm install rule, then deploy Direxio with domain __DOMAIN__.
 ```
 
 After reading this instruction, the agent should run the npm install commands below; it should not switch to a GitHub skill installer.
@@ -35,34 +35,34 @@ POSIX shells:
 
 ```bash
 npm install -g direxio-deployer@latest
-direxio-deployer skill install --agent codex --scope project --project .
+direxio-deployer skill install --agent codex
 ```
 
 Windows PowerShell:
 
 ```powershell
 npm install -g direxio-deployer@latest
-direxio-deployer skill install --agent codex --scope project --project .
+direxio-deployer skill install --agent codex
 ```
 
 Update the installed skill with the same host runtime:
 
 ```bash
 npm install -g direxio-deployer@latest
-direxio-deployer skill update --agent codex --scope project --project .
+direxio-deployer skill update --agent codex
 ```
 
-Use the matching agent name for your runtime: `codex`, `claudecode`, `gemini`, `cursor`, `copilot`, `openclaw`, `hermes`, `opencode`, `qoder`, `reasonix`, or another target listed in `references/agent-targets.md`. Use `--scope global` only when you intentionally want a host-level skill install:
+Use the matching agent name for your runtime: `codex`, `claudecode`, `gemini`, `cursor`, `copilot`, `openclaw`, `hermes`, `opencode`, `qoder`, `reasonix`, or another target listed in `references/agent-targets.md`. Add `--scope project --project <path>` only when you intentionally want a repository-local skill install:
 
 ```bash
-direxio-deployer skill install --agent codex --scope global
+direxio-deployer skill install --agent codex --scope project --project .
 ```
 
 The installer writes `.direxio-skill-install.json` into the target directory and refuses to overwrite unmanaged existing content unless `--force` is provided. To pin a version, install that package version first:
 
 ```bash
-npm install -g direxio-deployer@0.1.3
-direxio-deployer skill update --agent codex --scope project --project .
+npm install -g direxio-deployer@0.1.4
+direxio-deployer skill update --agent codex
 ```
 
 The CLI is implemented in Node and uses native paths for the host it runs on. On Windows it writes Windows-compatible paths; on Linux, macOS, Git Bash, or WSL it writes paths for that runtime.

package/README_zh.md

@@ -17,14 +17,14 @@
 
 ## Skill 安装和更新
 
-通过 npm 安装 deployer skill，再把它写入当前智能体运行时的 skill 目录。默认推荐 project-local 安装，让部署 skill 跟随当前 workspace。
+通过 npm 安装 deployer skill，再把它写入当前智能体运行时的 skill 目录。默认安装到所选智能体运行时的全局 skill 目录；只有在明确希望跟随某个仓库或 workspace 时，才指定 project-local 安装。
 
 GitHub 仓库保留测试用于维护和 CI，但发布到 npm 的包以及安装到智能体 skill 目录的副本不包含 `tests/`，以减小用户安装体积。
 
-如果你想让 Codex 一句话安装并开始部署，不要说“安装 skills <GitHub 链接>”。那会触发 GitHub skill 安装器，容易安装到全局 `~/.codex`。推荐只说短句，让 agent 先读本 README 中的 npm/project-local 安装规则：
+如果你想让 Codex 一句话安装并开始部署，不要说“安装 skills <GitHub 链接>”。那会触发 GitHub skill 安装器，而不是 npm 管理的安装器。推荐只说短句，把仓库地址作为读取 README 的位置，并让 agent 按 README 中的 npm 安装规则执行：
 
 ```text
-请按 direxio-deployer README 的 npm/project-local 规则安装 skill，然后部署 Direxio，域名 __DOMAIN__。
+请阅读 https://github.com/YingSuiAI/direxio-deployer 的 README，并按其中 npm 安装规则安装 skill，然后部署 Direxio，域名 __DOMAIN__。
 ```
 
 Agent 读到这句后应执行下方 npm 安装命令；不要改用 GitHub skill installer。
@@ -33,34 +33,34 @@ POSIX shell：
 
 ```bash
 npm install -g direxio-deployer@latest
-direxio-deployer skill install --agent codex --scope project --project .
+direxio-deployer skill install --agent codex
 ```
 
 Windows PowerShell：
 
 ```powershell
 npm install -g direxio-deployer@latest
-direxio-deployer skill install --agent codex --scope project --project .
+direxio-deployer skill install --agent codex
 ```
 
 在同一个宿主运行时中更新已安装 skill：
 
 ```bash
 npm install -g direxio-deployer@latest
-direxio-deployer skill update --agent codex --scope project --project .
+direxio-deployer skill update --agent codex
 ```
 
-根据当前运行时替换 agent 名称：`codex`、`claudecode`、`gemini`、`cursor`、`copilot`、`openclaw`、`hermes`、`opencode`、`qoder`、`reasonix`，或使用 `references/agent-targets.md` 中列出的其他目标。只有明确想安装到宿主级目录时才使用 `--scope global`：
+根据当前运行时替换 agent 名称：`codex`、`claudecode`、`gemini`、`cursor`、`copilot`、`openclaw`、`hermes`、`opencode`、`qoder`、`reasonix`，或使用 `references/agent-targets.md` 中列出的其他目标。只有明确想安装到某个项目目录时才使用 `--scope project --project <path>`：
 
 ```bash
-direxio-deployer skill install --agent codex --scope global
+direxio-deployer skill install --agent codex --scope project --project .
 ```
 
 安装器会在目标目录写入 `.direxio-skill-install.json`，并拒绝覆盖没有该 manifest 的既有目录，除非显式传入 `--force`。如需固定版本，先安装指定 npm 版本：
 
 ```bash
-npm install -g direxio-deployer@0.1.3
-direxio-deployer skill update --agent codex --scope project --project .
+npm install -g direxio-deployer@0.1.4
+direxio-deployer skill update --agent codex
 ```
 
 这个 CLI 由 Node 实现，并使用当前宿主的原生路径。Windows 下写入 Windows 路径；Linux、macOS、Git Bash 或 WSL 下写入对应运行时能读取的路径。

package/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: direxio-deployer
-description: Deploy, resume, verify, destroy, and locally wire a production P2P-IM Matrix server on AWS for any connent/connect-supported local agent runtime. Use when installing or updating this skill itself; install the versioned npm package `direxio-deployer` and use its CLI to place the skill in the runtime-specific project-local path from references/agent-targets.md unless the user explicitly asks for a global installation.
+description: Deploy, resume, verify, destroy, and locally wire a production P2P-IM Matrix server on AWS for any connent/connect-supported local agent runtime. Use when installing or updating this skill itself; install the versioned npm package `direxio-deployer` and use its CLI to place the skill in the runtime-specific global path from references/agent-targets.md unless the user explicitly asks for a project-local installation.
 ---
 
 # Direxio Deployer
@@ -24,13 +24,17 @@ against the versioned npm package:
 
 ```bash
 npm install -g direxio-deployer@latest
-direxio-deployer skill refresh --agent <runtime> --scope project --project <project-root>
+direxio-deployer skill refresh --agent <runtime>
 ```
 
 Use the current runtime name for `<runtime>` when known, such as `codex`,
-`claudecode`, `gemini`, `cursor`, `openclaw`, or `hermes`. Prefer project scope
-when a project or workspace root exists. Use `--scope global` only when the
-user explicitly asks for a global installation or no project target exists.
+`claudecode`, `gemini`, `cursor`, `openclaw`, or `hermes`. Use project scope
+only when the user explicitly asks for a repository-local install or provides
+a project root for that purpose:
+
+```bash
+direxio-deployer skill refresh --agent <runtime> --scope project --project <project-root>
+```
 
 `direxio-deployer skill refresh` checks the latest npm version, updates the
 global CLI when npm reports a newer package, and refreshes the managed skill
@@ -261,6 +265,19 @@ Step-by-step onboarding flow:
      credits only apply when the account, plan, region, and service usage are
      eligible. Recommend setting an AWS Budget or billing alert before leaving
      the node running.
+   - **Before asking for the final deployment confirmation**, run the S1
+     preflight or equivalent AWS CLI checks for the selected region so hard
+     capacity blockers are known up front. In particular, check EC2-VPC Elastic IP quota because each deployment needs one fixed public IP:
+
+     ```bash
+     aws service-quotas get-service-quota --service-code ec2 --quota-code L-0263D0A3 --query 'Quota.Value' --output text
+     aws ec2 describe-addresses --query 'length(Addresses[?Domain==`vpc`])' --output text
+     ```
+
+     If allocated Elastic IPs are already greater than or equal to quota, stop
+     before confirmation and tell the user to release an unused Elastic IP,
+     request quota, or choose another region. Do not wait until S3 allocation
+     fails on the live deployment path.
    - If the user asks what is billed, mention EC2/server, fixed public IPv4 or
      Elastic IP, storage, DNS, network traffic, and call relay traffic.
 
@@ -300,24 +317,25 @@ When the user asks to install or update this skill itself, or asks to wire Direx
 If the user says "install skills" and includes the GitHub repository URL
 `YingSuiAI/direxio-deployer`, do not use a generic GitHub skill installer for
 normal deployment use. First install the npm package and then run
-`direxio-deployer skill install --agent <runtime> --scope project --project
-<project-root>`. Use a Git clone only when the user explicitly asks for
+`direxio-deployer skill install --agent <runtime>`. Use a Git clone only when the user explicitly asks for
 deployer development or local patching.
 
-For this skill repository itself, first determine whether the current working directory belongs to a project or workspace. Treat an explicit workspace root, project files, or an existing agent-specific directory such as `.codex/`, `.claude/`, `.gemini/`, `.cursor/`, `.github/copilot/`, `.devin/`, `.opencode/`, `.qoder/`, `.pi/`, `.openclaw/`, or `.hermes/` as a project target.
-
-If a project target exists, install or update this skill with the versioned npm CLI at the runtime-specific project-local path from `references/agent-targets.md`:
+Install or update this skill with the versioned npm CLI at the runtime-specific
+global path from `references/agent-targets.md`:
 
 ```bash
 npm install -g direxio-deployer@latest
-direxio-deployer skill install --agent <runtime> --scope project --project <project-root>
-direxio-deployer skill update --agent <runtime> --scope project --project <project-root>
+direxio-deployer skill install --agent <runtime>
+direxio-deployer skill update --agent <runtime>
 ```
 
-The installer writes `.direxio-skill-install.json` into the target directory and refuses to overwrite unmanaged existing content unless the operator explicitly uses `--force`. Use global runtime skill directories only when the user explicitly asks for a global install or no project target exists:
+The installer writes `.direxio-skill-install.json` into the target directory
+and refuses to overwrite unmanaged existing content unless the operator
+explicitly uses `--force`. Use project-local runtime skill directories only
+when the user explicitly asks to install into a repository or workspace:
 
 ```bash
-direxio-deployer skill install --agent <runtime> --scope global
+direxio-deployer skill install --agent <runtime> --scope project --project <project-root>
 ```
 
 Use a Git clone only for development or local patching of this deployer, not as the normal end-user installation path.
@@ -355,7 +373,7 @@ The local MCP tool surface is `direxio-mcp`, installed from `direxio-mcp@latest`
 
 `DIREXIO_AGENT_PLATFORM` describes the host runtime following the skill, while `DIREXIO_CC_CONNECT_AGENT` describes the local agent backend that `direxio-connect` should launch. Host runtimes such as Hermes or OpenClaw are not native cc-connect backend types; S6 maps them to the generic ACP backend by default and records `cc_connect_agent=acp`. Override `DIREXIO_CC_CONNECT_AGENT` only when the operator intentionally wants a different local backend.
 
-`DIREXIO_AGENT_INSTALL` may be `skip`, `recommend`, or `auto`. Only `auto` attempts to run `npm install -g direxio-connent@latest` and `direxio-connect daemon install --config ~/.direxio/nodes/<service_id>/cc-connect/config.toml --service-name <service_id> --force`; the default `recommend` records and prints the command without mutating local daemon state. An automatic install is reported as installed only when `direxio-connect daemon status --service-name <service_id>` returns `Status: Running` and recent daemon logs do not show ACP session initialization failure; otherwise S6 records `agent_install_status=install_failed`. S6 calls `agent.matrix_session.create` with `agent_token` and retries transient HTTP 000/5xx responses before failing, because the Matrix action can become reachable a few seconds after `/healthz`.
+`DIREXIO_AGENT_INSTALL` may be `skip`, `recommend`, or `auto`. Only `auto` attempts to run `npm install -g direxio-connent@latest` and `direxio-connect daemon install --config ~/.direxio/nodes/<service_id>/cc-connect/config.toml --service-name <service_id> --force`; the default `recommend` records and prints the command without mutating local daemon state. An automatic install is reported as installed only when `direxio-connect daemon status --service-name <service_id>` returns `Status: Running` and recent daemon logs do not show ACP session initialization failure; otherwise S6 records `agent_install_status=install_failed`. S6 calls `agent.matrix_session.create` with `agent_token` and retries transient HTTP 000/404/408/409/425/429/5xx responses before failing, because the Matrix action can become reachable after `/healthz`; defaults are 12 attempts with exponential backoff capped by `DIREXIO_MATRIX_SESSION_RETRY_MAX_INTERVAL`.
 
 Voice input is supported through `direxio-connect` speech-to-text. When `DIREXIO_SPEECH_API_KEY` or a provider-specific key such as `DIREXIO_SPEECH_QWEN_API_KEY`, `OPENAI_API_KEY`, `GROQ_API_KEY`, `DASHSCOPE_API_KEY`, `GEMINI_API_KEY`, or `GOOGLE_API_KEY` is present, S6 writes `[speech] enabled = true` into the generated config. Without an STT key, do not claim voice input is enabled.
 

package/bin/direxio-deployer.mjs

@@ -94,14 +94,14 @@ function main() {
 
 function usage(exitCode) {
   const output = `Usage:
-  direxio-deployer skill install --agent <runtime> [--scope project|global] [--project <path>]
-  direxio-deployer skill update --agent <runtime> [--scope project|global] [--project <path>]
-  direxio-deployer skill refresh --agent <runtime> [--scope project|global] [--project <path>]
+  direxio-deployer skill install --agent <runtime> [--scope global|project] [--project <path>]
+  direxio-deployer skill update --agent <runtime> [--scope global|project] [--project <path>]
+  direxio-deployer skill refresh --agent <runtime> [--scope global|project] [--project <path>]
 
 Options:
   --agent <runtime>   Target agent runtime. Default: codex
-  --scope <scope>     project or global. Default: project
-  --project <path>    Project root for project installs. Default: current directory
+  --scope <scope>     global or project. Default: global
+  --project <path>    Project root for explicit project installs. Default: current directory
   --target <path>     Explicit install target override
   --home <path>       Home directory override for global installs
   --dry-run           Resolve and print without writing
@@ -115,7 +115,7 @@ Options:
 function parseArgs(args) {
   const options = {
     agent: "codex",
-    scope: "project",
+    scope: "global",
     project: process.cwd(),
     home: homedir(),
     target: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "direxio-deployer",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Versioned Direxio deployer agent skill and portable deployment orchestration tools.",
   "type": "module",
   "bin": {
@@ -18,7 +18,7 @@
     "scripts/"
   ],
   "scripts": {
-    "test": "bash tests/npm_skill_distribution_test.sh && bash tests/skill_structure_test.sh && bash tests/private_file_permissions_test.sh && bash tests/s6_wire_local_test.sh && bash tests/render_userdata_remote_nodes_test.sh"
+    "test": "bash tests/npm_skill_distribution_test.sh && bash tests/skill_structure_test.sh && bash tests/private_file_permissions_test.sh && bash tests/eip_preflight_test.sh && bash tests/mcp_tools_runtime_check_test.sh && bash tests/runtime_summary_check_test.sh && bash tests/s6_wire_local_test.sh && bash tests/render_userdata_remote_nodes_test.sh"
   },
   "engines": {
     "node": ">=18"

package/references/agent-targets.md

@@ -4,52 +4,52 @@ Use this file when installing or updating this skill and when reviewing S6 local
 
 ## Npm Skill Installation
 
-Prefer a project-local npm-managed install when a project or workspace exists. Install the versioned package, then let the CLI copy the skill bundle into the runtime-specific target:
+Prefer the npm-managed global install for normal users. Install the versioned package, then let the CLI copy the skill bundle into the selected runtime's host-level skill directory:
 
-Do not use a generic "install skills <GitHub URL>" instruction for normal users. That can invoke a host's GitHub skill installer and place this repository under the global runtime directory before the npm-managed installer runs. A short user prompt should point the agent back to this npm/project-local rule:
+Do not use a generic "install skills <GitHub URL>" instruction for normal users. That can invoke a host's GitHub skill installer instead of the npm-managed installer. A short user prompt should give the repository URL for reading only and point the agent back to this npm install rule:
 
 ```text
-Follow the direxio-deployer README npm/project-local install rule, then deploy Direxio with domain __DOMAIN__.
+Read https://github.com/YingSuiAI/direxio-deployer README and follow its npm install rule, then deploy Direxio with domain __DOMAIN__.
 ```
 
 POSIX shells:
 
 ```bash
 npm install -g direxio-deployer@latest
-direxio-deployer skill install --agent codex --scope project --project PROJECT_ROOT
-direxio-deployer skill update --agent codex --scope project --project PROJECT_ROOT
+direxio-deployer skill install --agent codex
+direxio-deployer skill update --agent codex
 ```
 
 Windows PowerShell:
 
 ```powershell
 npm install -g direxio-deployer@latest
-direxio-deployer skill install --agent codex --scope project --project PROJECT_ROOT
-direxio-deployer skill update --agent codex --scope project --project PROJECT_ROOT
+direxio-deployer skill install --agent codex
+direxio-deployer skill update --agent codex
 ```
 
-Use `--scope global` only when the user explicitly asks for a global install or no project target exists. Use a Git clone only for deployer development or local patching, not as the normal end-user installation path. The npm installer writes `.direxio-skill-install.json` and refuses to overwrite unmanaged existing target directories unless `--force` is passed.
+Use `--scope project --project PROJECT_ROOT` only when the user explicitly asks for a repository-local install. Use a Git clone only for deployer development or local patching, not as the normal end-user installation path. The npm installer writes `.direxio-skill-install.json` and refuses to overwrite unmanaged existing target directories unless `--force` is passed.
 
-| Runtime | Project-local skill target | Global fallback only when explicitly requested or no project exists |
+| Runtime | Default global skill target | Explicit project-local skill target |
 | --- | --- | --- |
-| Codex | `PROJECT_ROOT/.codex/skills/direxio-deployer` | `${CODEX_HOME:-$HOME/.codex}/skills/direxio-deployer` |
-| Claude Code | `PROJECT_ROOT/.claude/skills/direxio-deployer` | `${CLAUDE_HOME:-$HOME/.claude}/skills/direxio-deployer` |
-| Gemini | `PROJECT_ROOT/.gemini/skills/direxio-deployer` | `${GEMINI_HOME:-$HOME/.gemini}/skills/direxio-deployer` |
-| Cursor | `PROJECT_ROOT/.cursor/skills/direxio-deployer` | `${CURSOR_HOME:-$HOME/.cursor}/skills/direxio-deployer` |
-| GitHub Copilot | `PROJECT_ROOT/.github/copilot/skills/direxio-deployer` | `$HOME/.github/copilot/skills/direxio-deployer` |
-| OpenClaw | `PROJECT_ROOT/.openclaw/skills/direxio-deployer` | `${OPENCLAW_HOME:-$HOME/.openclaw}/skills/direxio-deployer` |
-| Hermes | `PROJECT_ROOT/.hermes/skills/direxio-deployer` | `${HERMES_HOME:-$HOME/.hermes}/skills/direxio-deployer` |
-| ACP-compatible | `PROJECT_ROOT/.agents/skills/direxio-deployer` | `$HOME/.agents/skills/direxio-deployer` |
-| Antigravity | `PROJECT_ROOT/.antigravity/skills/direxio-deployer` | `${ANTIGRAVITY_HOME:-$HOME/.antigravity}/skills/direxio-deployer` |
-| Devin | `PROJECT_ROOT/.devin/skills/direxio-deployer` | `${DEVIN_HOME:-$HOME/.devin}/skills/direxio-deployer` |
-| iFlow | `PROJECT_ROOT/.iflow/skills/direxio-deployer` | `${IFLOW_HOME:-$HOME/.iflow}/skills/direxio-deployer` |
-| Kimi | `PROJECT_ROOT/.kimi/skills/direxio-deployer` | `${KIMI_HOME:-$HOME/.kimi}/skills/direxio-deployer` |
-| OpenCode | `PROJECT_ROOT/.opencode/skills/direxio-deployer` | `${OPENCODE_HOME:-$HOME/.opencode}/skills/direxio-deployer` |
-| Pi | `PROJECT_ROOT/.pi/agent/skills/direxio-deployer` | `${PI_CODING_AGENT_DIR:-$HOME/.pi/agent}/skills/direxio-deployer` |
-| Qoder | `PROJECT_ROOT/.qoder/skills/direxio-deployer` | `${QODER_HOME:-$HOME/.qoder}/skills/direxio-deployer` |
-| Reasonix | `PROJECT_ROOT/.reasonix/skills/direxio-deployer` | `${REASONIX_HOME:-$HOME/.reasonix}/skills/direxio-deployer` |
-| tmux | `PROJECT_ROOT/.agent/skills/direxio-deployer` | `$HOME/.agent/skills/direxio-deployer` |
-| Generic or unknown | `PROJECT_ROOT/.agent/skills/direxio-deployer` | `$HOME/.agent/skills/direxio-deployer` |
+| Codex | `${CODEX_HOME:-$HOME/.codex}/skills/direxio-deployer` | `PROJECT_ROOT/.codex/skills/direxio-deployer` |
+| Claude Code | `${CLAUDE_HOME:-$HOME/.claude}/skills/direxio-deployer` | `PROJECT_ROOT/.claude/skills/direxio-deployer` |
+| Gemini | `${GEMINI_HOME:-$HOME/.gemini}/skills/direxio-deployer` | `PROJECT_ROOT/.gemini/skills/direxio-deployer` |
+| Cursor | `${CURSOR_HOME:-$HOME/.cursor}/skills/direxio-deployer` | `PROJECT_ROOT/.cursor/skills/direxio-deployer` |
+| GitHub Copilot | `$HOME/.github/copilot/skills/direxio-deployer` | `PROJECT_ROOT/.github/copilot/skills/direxio-deployer` |
+| OpenClaw | `${OPENCLAW_HOME:-$HOME/.openclaw}/skills/direxio-deployer` | `PROJECT_ROOT/.openclaw/skills/direxio-deployer` |
+| Hermes | `${HERMES_HOME:-$HOME/.hermes}/skills/direxio-deployer` | `PROJECT_ROOT/.hermes/skills/direxio-deployer` |
+| ACP-compatible | `$HOME/.agents/skills/direxio-deployer` | `PROJECT_ROOT/.agents/skills/direxio-deployer` |
+| Antigravity | `${ANTIGRAVITY_HOME:-$HOME/.antigravity}/skills/direxio-deployer` | `PROJECT_ROOT/.antigravity/skills/direxio-deployer` |
+| Devin | `${DEVIN_HOME:-$HOME/.devin}/skills/direxio-deployer` | `PROJECT_ROOT/.devin/skills/direxio-deployer` |
+| iFlow | `${IFLOW_HOME:-$HOME/.iflow}/skills/direxio-deployer` | `PROJECT_ROOT/.iflow/skills/direxio-deployer` |
+| Kimi | `${KIMI_HOME:-$HOME/.kimi}/skills/direxio-deployer` | `PROJECT_ROOT/.kimi/skills/direxio-deployer` |
+| OpenCode | `${OPENCODE_HOME:-$HOME/.opencode}/skills/direxio-deployer` | `PROJECT_ROOT/.opencode/skills/direxio-deployer` |
+| Pi | `${PI_CODING_AGENT_DIR:-$HOME/.pi/agent}/skills/direxio-deployer` | `PROJECT_ROOT/.pi/agent/skills/direxio-deployer` |
+| Qoder | `${QODER_HOME:-$HOME/.qoder}/skills/direxio-deployer` | `PROJECT_ROOT/.qoder/skills/direxio-deployer` |
+| Reasonix | `${REASONIX_HOME:-$HOME/.reasonix}/skills/direxio-deployer` | `PROJECT_ROOT/.reasonix/skills/direxio-deployer` |
+| tmux | `$HOME/.agent/skills/direxio-deployer` | `PROJECT_ROOT/.agent/skills/direxio-deployer` |
+| Generic or unknown | `$HOME/.agent/skills/direxio-deployer` | `PROJECT_ROOT/.agent/skills/direxio-deployer` |
 
 ## Direxio Connect Target
 

package/references/deployment-workflow.md

@@ -4,11 +4,24 @@
 
 1. Confirm `DOMAIN`, `DOMAIN_MODE`, and `CONFIRM_DOMAIN_BINDING=1`.
 2. Confirm AWS region, credentials, billing, instance type, and costs.
-3. Check dependencies with the OS-specific commands in `tooling.md`.
-4. Check current DNS provider. Prefer `DOMAIN_MODE=route53` when the user
+3. Before asking for final deployment confirmation, check regional hard blockers
+   that can be read without creating resources: default VPC, EC2 vCPU quota,
+   Elastic IP quota/current allocation, and Ubuntu AMI availability. The S1
+   preflight performs these checks; for a manual EIP check, compare:
+
+```bash
+aws service-quotas get-service-quota --service-code ec2 --quota-code L-0263D0A3 --query 'Quota.Value' --output text
+aws ec2 describe-addresses --query 'length(Addresses[?Domain==`vpc`])' --output text
+```
+
+   If the selected region has no available Elastic IP capacity, stop before
+   confirmation and ask the user to release an unused Elastic IP, request a
+   higher EC2-VPC Elastic IP quota, or choose another region.
+4. Check dependencies with the OS-specific commands in `tooling.md`.
+5. Check current DNS provider. Prefer `DOMAIN_MODE=route53` when the user
    confirms AWS may manage the hosted zone and A record. Use `DOMAIN_MODE=user`
    only as a fallback when no DNS provider automation is available.
-5. Check state:
+6. Check state:
 
 ```bash
 bash scripts/orchestrate.sh status

package/references/runtime-wiring.md

@@ -74,7 +74,7 @@ DIREXIO_CREDENTIALS_FILE=~/.direxio/nodes/<service_id>/credentials.json direxio-
 
 ## cc-connect Matrix Bridge
 
-S6 calls `agent.matrix_session.create` with the backend `agent_token`, not the owner `access_token`. Current message-server builds must return a Matrix session for `@agent:<server>`, not for `@owner:<server>`. S6 retries transient HTTP 000/5xx responses before failing, because the Matrix action can become reachable shortly after `/healthz`. The resulting session is stored at:
+S6 calls `agent.matrix_session.create` with the backend `agent_token`, not the owner `access_token`. Current message-server builds must return a Matrix session for `@agent:<server>`, not for `@owner:<server>`. S6 retries transient HTTP 000/404/408/409/425/429/5xx responses before failing, because the Matrix action can become reachable after `/healthz`; defaults are 12 attempts with exponential backoff capped by `DIREXIO_MATRIX_SESSION_RETRY_MAX_INTERVAL`. The resulting session is stored at:
 
 ```text
 ~/.direxio/nodes/<service_id>/cc-connect/matrix-session.json

package/references/state-machine.md

@@ -5,7 +5,7 @@
 ## 阶段
 
 - **S0_PREREQ_AWS**: 校验 AWS CLI、凭据和账号身份。
-- **S1_PREFLIGHT**: 校验 region、默认 VPC、vCPU 配额、Ubuntu amd64 AMI。
+- **S1_PREFLIGHT**: 校验 region、默认 VPC、vCPU 配额、Elastic IP 可用配额、Ubuntu amd64 AMI。
 - **S2_DOMAIN**: 确认正式长期域名和 Matrix `server_name` 不可逆绑定。
 - **S3_PROVISION**: 创建 EC2、密钥对、安全组、Elastic IP，按 DNS 模式处理 Route53 hosted zone/A 记录或等待外部 DNS，渲染 cloud-init。默认镜像 `MESSAGE_SERVER_IMAGE=direxio/message-server:latest`。
 - **S4_BOOTSTRAP_STACK**: 等 cloud-init 安装 Docker 并启动 `postgres:18 + message-server + caddy + coturn`，轮询 `https://<domain>/healthz`。

package/references/windows-deployment-notes.md

@@ -109,7 +109,7 @@ Use the Git Bash `$HOME` path for files generated by the deployer. If running `d
 
 ## EC2 SSH Key Paths
 
-SSH key files are written with Windows-compatible paths such as `C:/Users/.../.direxio/deploy/p2p-*.pem`. The deployer removes inherited Windows ACLs where possible so OpenSSH does not reject the private key as too open. The SSH command printed in the delivery summary works in Git Bash. If using PowerShell or cmd, convert forward slashes to backslashes.
+SSH key files are written with Windows-compatible paths such as `C:/Users/.../.direxio/deploy/p2p-*.pem`. The deployer removes broad Windows ACL entries such as `Users`, `Authenticated Users`, `Everyone`, and Codex sandbox groups where possible, while keeping the current Windows user, `SYSTEM`, and `Administrators` on the file so OpenSSH does not reject the private key as too open. The SSH command printed in the delivery summary works in Git Bash. If using PowerShell or cmd, convert forward slashes to backslashes.
 
 ## Verifying Deployment
 

package/scripts/lib/aws.sh

@@ -53,6 +53,9 @@ aws_redact_arn() {
 # EC2 vCPU quota code: Running On-Demand Standard instances.
 EC2_STD_QUOTA_CODE="L-1216C47A"
 
+# EC2-VPC Elastic IP addresses per region.
+EC2_VPC_EIP_QUOTA_CODE="L-0263D0A3"
+
 # Dynamically resolve the latest Ubuntu 22.04 amd64 AMI; never hard-code AMI IDs.
 aws_lookup_ubuntu_ami() {
   local ami

package/scripts/lib/state.sh

@@ -57,17 +57,35 @@ restrict_private_file() {
       if command -v cygpath >/dev/null 2>&1; then
         win_file=$(cygpath -w "$file")
       fi
-      user=$(cmd.exe /c whoami 2>/dev/null | tr -d '\r' | tail -n 1 || true)
+      user=$(_windows_current_user)
       user_domain=${USERDOMAIN:-}
-      icacls "$win_file" /inheritance:r >/dev/null 2>&1 || true
-      icacls "$win_file" /remove:g \
+      MSYS2_ARG_CONV_EXCL='*' icacls "$win_file" /inheritance:r >/dev/null 2>&1 || true
+      MSYS2_ARG_CONV_EXCL='*' icacls "$win_file" /remove:g \
         "Users" "Authenticated Users" "Everyone" "CodexSandboxUsers" \
         "${user_domain}\\CodexSandboxUsers" >/dev/null 2>&1 || true
-      [ -n "$user" ] && icacls "$win_file" /grant:r "$user:R" >/dev/null 2>&1 || true
+      MSYS2_ARG_CONV_EXCL='*' icacls "$win_file" /grant:r "NT AUTHORITY\\SYSTEM:F" "BUILTIN\\Administrators:F" >/dev/null 2>&1 || true
+      [ -n "$user" ] && MSYS2_ARG_CONV_EXCL='*' icacls "$win_file" /grant:r "$user:F" >/dev/null 2>&1 || true
       ;;
   esac
 }
 
+_windows_current_user() {
+  if [ -n "${USERDOMAIN:-}" ] && [ -n "${USERNAME:-}" ]; then
+    printf '%s\\%s\n' "$USERDOMAIN" "$USERNAME"
+    return 0
+  fi
+  if command -v powershell.exe >/dev/null 2>&1; then
+    powershell.exe -NoProfile -NonInteractive -Command '[System.Security.Principal.WindowsIdentity]::GetCurrent().Name' 2>/dev/null \
+      | tr -d '\r' | tail -n 1
+    return 0
+  fi
+  if command -v whoami.exe >/dev/null 2>&1; then
+    whoami.exe 2>/dev/null | tr -d '\r' | tail -n 1
+    return 0
+  fi
+  return 0
+}
+
 # Initialize state.json for a new deployment.
 state_init() {
   mkdir -p "$P2P_WORKDIR"

package/scripts/mcp-tools-list.mjs

@@ -1,156 +1,92 @@
 #!/usr/bin/env node
-import { spawn } from "node:child_process";
+import { spawnSync } from "node:child_process";
+import { existsSync, realpathSync } from "node:fs";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
 
 const command = process.argv[2] || "direxio-mcp";
 const timeoutMs = Number.parseInt(process.env.DIREXIO_MCP_TOOLS_TIMEOUT_MS || "8000", 10);
 
-const child = spawn(command, {
-  env: process.env,
-  shell: true,
-  stdio: ["pipe", "pipe", "pipe"]
-});
-
-let stdout = Buffer.alloc(0);
-let stderr = "";
-let completed = false;
-const responses = new Map();
-
 const timer = setTimeout(() => {
   finishWithError(`timed out waiting for MCP tools/list after ${timeoutMs}ms`);
 }, timeoutMs);
 
-child.stderr.on("data", (chunk) => {
-  stderr += chunk.toString("utf8");
-});
-
-child.stdout.on("data", (chunk) => {
-  stdout = Buffer.concat([stdout, chunk]);
-  readFrames();
-  if (completed) return;
-  if (responses.has(2)) {
-    const response = responses.get(2);
-    const tools = Array.isArray(response?.result?.tools) ? response.result.tools : [];
-    const names = tools
-      .map((tool) => tool?.name)
-      .filter((name) => typeof name === "string" && name.length > 0);
-    finish({ tools: names, tool_count: names.length });
-  }
-});
-
-child.on("error", (error) => {
-  finishWithError(error.message);
-});
-
-child.on("exit", (code) => {
-  if (!completed && code !== 0) {
-    finishWithError(`MCP server exited with code ${code}${stderr ? `: ${stderr.trim()}` : ""}`);
-  }
-});
-
-send({
-  jsonrpc: "2.0",
-  id: 1,
-  method: "initialize",
-  params: {
-    protocolVersion: "2024-11-05",
-    capabilities: {},
-    clientInfo: { name: "direxio-deployer", version: "0.0.0" }
-  }
-});
-send({ jsonrpc: "2.0", method: "notifications/initialized", params: {} });
-send({ jsonrpc: "2.0", id: 2, method: "tools/list", params: {} });
-
-function send(message) {
-  const body = JSON.stringify(message);
-  child.stdin.write(`Content-Length: ${Buffer.byteLength(body, "utf8")}\r\n\r\n${body}`);
+try {
+  const packageRoot = resolveDirexioMcpPackageRoot(command);
+  const sdkRoot = path.join(packageRoot, "node_modules", "@modelcontextprotocol", "sdk", "dist", "esm");
+  const { Client } = await import(pathToFileURL(path.join(sdkRoot, "client", "index.js")).href);
+  const { StdioClientTransport } = await import(pathToFileURL(path.join(sdkRoot, "client", "stdio.js")).href);
+
+  const transport = new StdioClientTransport({
+    command: process.execPath,
+    args: [path.join(packageRoot, "dist", "index.js")],
+    env: process.env
+  });
+  const client = new Client({ name: "direxio-deployer", version: "0.0.0" }, { capabilities: {} });
+  await client.connect(transport);
+  const response = await client.listTools();
+  await client.close();
+
+  const names = (Array.isArray(response?.tools) ? response.tools : [])
+    .map((tool) => tool?.name)
+    .filter((name) => typeof name === "string" && name.length > 0);
+  finish({ tools: names, tool_count: names.length });
+} catch (error) {
+  finishWithError(error instanceof Error ? error.message : String(error));
 }
 
-function readFrames() {
-  while (true) {
-    if (stdout.length === 0) return;
-    if (stdout[0] === 10 || stdout[0] === 13) {
-      stdout = stdout.subarray(1);
-      continue;
-    }
-    if (startsWithHeader(stdout, "Content-Length:")) {
-      const header = readHeader(stdout);
-      if (!header) return;
-      const contentLength = parseContentLength(header.text);
-      if (!Number.isSafeInteger(contentLength) || contentLength < 0) {
-        finishWithError("MCP response frame is missing a valid Content-Length header");
-        return;
-      }
-      const messageEnd = header.bodyStart + contentLength;
-      if (stdout.length < messageEnd) return;
-      const body = stdout.subarray(header.bodyStart, messageEnd).toString("utf8");
-      stdout = stdout.subarray(messageEnd);
-      handleMessage(body);
-      if (completed) return;
-      continue;
+function resolveDirexioMcpPackageRoot(commandName) {
+  const executable = resolveExecutable(commandName);
+  const basedir = path.dirname(realpathSync(executable));
+  const candidates = [
+    path.join(basedir, "node_modules", "direxio-mcp"),
+    path.join(basedir, "..", "node_modules", "direxio-mcp"),
+    path.join(basedir, "..")
+  ];
+  for (const candidate of candidates) {
+    if (existsSync(path.join(candidate, "package.json")) && existsSync(path.join(candidate, "dist", "index.js"))) {
+      return realpathSync(candidate);
     }
-
-    const lineEnd = stdout.indexOf("\n");
-    if (lineEnd < 0) return;
-    const line = stdout.subarray(0, lineEnd).toString("utf8").replace(/\r$/, "");
-    stdout = stdout.subarray(lineEnd + 1);
-    if (line.length === 0) continue;
-    handleMessage(line);
-    if (completed) return;
   }
+  throw new Error(`unable to locate direxio-mcp package root from ${executable}`);
 }
 
-function startsWithHeader(buffer, header) {
-  return buffer.subarray(0, header.length).toString("utf8").toLowerCase() === header.toLowerCase();
-}
-
-function readHeader(buffer) {
-  let marker = "\r\n\r\n";
-  let headerEnd = buffer.indexOf(marker);
-  if (headerEnd < 0) {
-    marker = "\n\n";
-    headerEnd = buffer.indexOf(marker);
+function resolveExecutable(commandName) {
+  const nativeCommand = nativePath(commandName);
+  if (path.isAbsolute(nativeCommand) && existsSync(nativeCommand)) {
+    return nativeCommand;
   }
-  if (headerEnd < 0) return null;
-  return {
-    text: buffer.subarray(0, headerEnd).toString("utf8"),
-    bodyStart: headerEnd + marker.length
-  };
-}
-
-function parseContentLength(headerText) {
-  for (const line of headerText.split(/\r?\n/)) {
-    const match = /^content-length:\s*(\d+)\s*$/i.exec(line);
-    if (match) return Number.parseInt(match[1], 10);
+  const lookup = process.platform === "win32"
+    ? spawnSync("where.exe", [nativeCommand], { encoding: "utf8" })
+    : spawnSync("sh", ["-lc", `command -v ${shellQuote(nativeCommand)}`], { encoding: "utf8" });
+  if (lookup.status !== 0 || !lookup.stdout.trim()) {
+    throw new Error(`unable to find ${commandName} on PATH`);
   }
-  return NaN;
+  return lookup.stdout.trim().split(/\r?\n/)[0];
 }
 
-function handleMessage(raw) {
-  let message;
-  try {
-    message = JSON.parse(raw);
-  } catch (error) {
-    finishWithError(`invalid MCP JSON response: ${error.message}`);
-    return;
+function nativePath(value) {
+  if (process.platform !== "win32" || !String(value).startsWith("/")) {
+    return value;
   }
-  if (typeof message.id !== "undefined") {
-    responses.set(message.id, message);
+  const converted = spawnSync("cygpath", ["-w", value], { encoding: "utf8" });
+  if (converted.status === 0 && converted.stdout.trim()) {
+    return converted.stdout.trim();
   }
+  return value;
+}
+
+function shellQuote(value) {
+  return `'${String(value).replace(/'/g, "'\\''")}'`;
 }
 
 function finish(value) {
-  if (completed) return;
-  completed = true;
   clearTimeout(timer);
   console.log(JSON.stringify(value));
-  child.kill();
 }
 
 function finishWithError(message) {
-  if (completed) return;
-  completed = true;
   clearTimeout(timer);
   console.error(message);
-  child.kill();
   process.exitCode = 1;
 }

package/scripts/orchestrate.sh

@@ -122,7 +122,7 @@ cmd_status_inventory() {
 phase_user_meaning() {
   case "$1" in
     S0_PREREQ_AWS)      echo "AWS credentials, CLI tooling, or account identity are not ready." ;;
-    S1_PREFLIGHT)       echo "AWS region, default VPC, quota, or Ubuntu AMI checks are not ready." ;;
+    S1_PREFLIGHT)       echo "AWS region, default VPC, EC2/EIP quota, or Ubuntu AMI checks are not ready." ;;
     S2_DOMAIN)          echo "The long-lived domain, DNS authority, or irreversible Matrix server_name binding is not confirmed." ;;
     S3_PROVISION)       echo "AWS infrastructure provisioning, fixed public IP, security group, or DNS record setup is not complete." ;;
     S4_BOOTSTRAP_STACK) echo "The EC2 instance exists, but cloud-init, Docker, Caddy/TLS, or message-server has not reached healthy state." ;;
@@ -212,7 +212,7 @@ status_next_action() {
 
   case "$1" in
     S0_PREREQ_AWS)      echo "configure AWS CLI credentials for the selected deployment identity and rerun status" ;;
-    S1_PREFLIGHT)       echo "fix AWS region, default VPC, EC2 quota, or AMI availability before creating resources" ;;
+    S1_PREFLIGHT)       echo "fix AWS region, default VPC, EC2/EIP quota, or AMI availability before creating resources" ;;
     S2_DOMAIN)          echo "confirm the long-lived domain, DNS authority, and irreversible Matrix server_name binding" ;;
     S3_PROVISION)       echo "inspect EC2 provisioning, Elastic IP allocation, security group creation, and DNS record setup" ;;
     S4_BOOTSTRAP_STACK) echo "inspect cloud-init, Docker, Caddy/TLS, and message-server logs over SSH" ;;

package/scripts/phases/s1_preflight.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-# S1 PREFLIGHT - default VPC, EC2 vCPU quota, and AMI checks.
+# S1 PREFLIGHT - default VPC, EC2 vCPU quota, Elastic IP, and AMI checks.
 #
-# New AWS accounts often start with low or zero EC2 quota. Report the blocker
-# and keep polling instead of losing deployment state.
+# New AWS accounts often start with low or exhausted EC2/EIP quota. Report the
+# blocker before S3 creates resources.
 
 run_phase() {
   aws_env_prep
@@ -37,7 +37,10 @@ run_phase() {
       || { phase_set S1_PREFLIGHT failed "quota polling interrupted"; return 1; }
   fi
 
-  # 3) AMI (amd64/x86).
+  # 3) Elastic IP quota and current regional usage. Unknown quota is warned but not blocked.
+  _check_eip_capacity || return $?
+
+  # 4) AMI (amd64/x86).
   local ami
   ami=$(aws_lookup_ubuntu_ami)
   if [ "$ami" = "None" ] || [ -z "$ami" ]; then
@@ -70,3 +73,33 @@ _quota_ge_2() {
   _is_unknown_quota "$q" && return 1
   _num_ge "$q" 2
 }
+
+_check_eip_capacity() {
+  local quota allocated available
+  quota=$(aws service-quotas get-service-quota --service-code ec2 --quota-code "$EC2_VPC_EIP_QUOTA_CODE" \
+          --query 'Quota.Value' --output text 2>/dev/null || echo "unknown")
+  quota=${quota:-unknown}
+  allocated=$(aws ec2 describe-addresses \
+              --query 'length(Addresses[?Domain==`vpc`])' --output text 2>/dev/null || echo "unknown")
+  allocated=${allocated:-unknown}
+
+  res_set eip_quota "$quota"
+  res_set eip_allocated "$allocated"
+
+  if _is_unknown_quota "$quota" || _is_unknown_quota "$allocated"; then
+    warn "Could not read Elastic IP quota or current allocation; continuing. If allocate-address fails, check regional EIP quota."
+    return 0
+  fi
+
+  available=$(awk -v q="$quota" -v a="$allocated" 'BEGIN { v=int(q+0)-int(a+0); if (v < 0) v=0; print v }')
+  res_set eip_available "$available"
+  log "Elastic IP quota = $quota, allocated = $allocated, available = $available (need 1)"
+
+  if ! _num_ge "$available" 1; then
+    phase_set S1_PREFLIGHT waiting_user "Elastic IP quota exhausted: allocated=$allocated quota=$quota"
+    warn "This region has no available Elastic IP quota: allocated=$allocated quota=$quota."
+    warn "Release an unused Elastic IP, request a higher EC2-VPC Elastic IP quota, or choose another AWS region, then rerun."
+    return 2
+  fi
+  return 0
+}

package/scripts/phases/s6_wire_local.sh

@@ -886,11 +886,13 @@ EOF
 
 _create_cc_connect_matrix_session() {
   local asurl=$1 agent_auth_token=$2 device_id=$3 out=$4 body code http_body
-  local max_attempts interval attempt preview
+  local max_attempts interval max_interval attempt preview sleep_for
   body=$(json_build matrix-session-create "$device_id")
-  max_attempts=${DIREXIO_MATRIX_SESSION_CREATE_MAX:-4}
+  max_attempts=${DIREXIO_MATRIX_SESSION_CREATE_MAX:-12}
   interval=${DIREXIO_MATRIX_SESSION_RETRY_INTERVAL:-2}
+  max_interval=${DIREXIO_MATRIX_SESSION_RETRY_MAX_INTERVAL:-10}
   attempt=1
+  sleep_for=$interval
   while [ "$attempt" -le "$max_attempts" ]; do
     http_body=$(mktemp)
     code=$(curl -sk \
@@ -913,10 +915,14 @@ _create_cc_connect_matrix_session() {
     preview=$(head -c 200 "$http_body" 2>/dev/null || true)
     rm -f "$http_body"
     case "${code:-000}" in
-      000|5*)
+      000|404|408|409|425|429|5*)
         if [ "$attempt" -lt "$max_attempts" ]; then
-          warn "agent.matrix_session.create returned HTTP ${code:-000} on attempt $attempt/$max_attempts; retrying."
-          sleep "$interval"
+          warn "agent.matrix_session.create returned HTTP ${code:-000} on attempt $attempt/$max_attempts; retrying in ${sleep_for}s."
+          sleep "$sleep_for"
+          if _is_non_negative_integer "$sleep_for" && _is_non_negative_integer "$max_interval"; then
+            sleep_for=$((sleep_for * 2))
+            [ "$sleep_for" -gt "$max_interval" ] && sleep_for=$max_interval
+          fi
           attempt=$((attempt + 1))
           continue
         fi
@@ -932,6 +938,13 @@ _create_cc_connect_matrix_session() {
   return 1
 }
 
+_is_non_negative_integer() {
+  case "$1" in
+    ''|*[!0-9]*) return 1 ;;
+    *) return 0 ;;
+  esac
+}
+
 _write_cc_connect_config() {
   local config_path=$1 data_dir=$2 project=$3 agent=$4 workspace=$5 homeserver=$6 matrix_token=$7 matrix_user=$8 room_id=$9 admin_from=${10:-} agent_cmd=${11:-} agent_options_toml=${12:-}
   local q_data q_project q_agent q_workspace q_homeserver q_token q_user q_room q_admin_from q_agent_cmd speech_toml default_agent_options_toml