direxio-deployer 0.1.1 → 0.1.2

package/README.md

@@ -23,6 +23,12 @@ Install the deployer skill from npm, then place it into the current agent runtim
 
 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. Say this instead:
+
+```text
+Install the Direxio deployer skill in the current project via npm: run npm install -g direxio-deployer@latest, then run direxio-deployer skill install --agent codex --scope project --project .; do not install the skill from GitHub and do not install it globally under ~/.codex. After installation, use that skill to deploy Direxio with domain __DOMAIN__.
+```
+
 POSIX shells:
 
 ```bash
@@ -53,7 +59,7 @@ direxio-deployer skill install --agent codex --scope global
 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.1
+npm install -g direxio-deployer@0.1.2
 direxio-deployer skill update --agent codex --scope project --project .
 ```
 
@@ -120,7 +126,7 @@ bash scripts/orchestrate.sh
 ```
 
 Supported install modes: `recommended` and `cc-connect`.
-If `DIREXIO_AGENT_PLATFORM=auto` cannot identify a single supported runtime, set `DIREXIO_CC_CONNECT_AGENT` explicitly. For OpenClaw or Hermes defaults, force the host runtime with `DIREXIO_AGENT_PLATFORM=openclaw` or `DIREXIO_AGENT_PLATFORM=hermes`; setting only `DIREXIO_CC_CONNECT_AGENT=acp` selects generic ACP and requires manual options. For OpenClaw Gateway ACP, set `DIREXIO_OPENCLAW_ACP_URL`, `DIREXIO_OPENCLAW_ACP_TOKEN_FILE`, and `DIREXIO_OPENCLAW_ACP_SESSION` from the current OpenClaw runtime after pairing. Use `DIREXIO_OPENCLAW_ACP_ARGS_TOML` only when you need to provide the complete OpenClaw ACP args array yourself. Use `DIREXIO_HERMES_ACP_ARGS_TOML` for the child Hermes args; S6 prefixes the `hermes-acp-adapter -- <hermes-command>` wrapper automatically.
+If `DIREXIO_AGENT_PLATFORM=auto` cannot identify a single supported runtime, set `DIREXIO_CC_CONNECT_AGENT` explicitly. For OpenClaw or Hermes defaults, force the host runtime with `DIREXIO_AGENT_PLATFORM=openclaw` or `DIREXIO_AGENT_PLATFORM=hermes`; setting only `DIREXIO_CC_CONNECT_AGENT=acp` selects generic ACP and requires manual options. OpenClaw Gateway ACP defaults to `["acp", "--session", "agent:main:main"]` and lets `openclaw acp` auto-detect the Gateway from `~/.openclaw/openclaw.json`. To force explicit Gateway settings, set all of `DIREXIO_OPENCLAW_ACP_URL`, `DIREXIO_OPENCLAW_ACP_TOKEN_FILE`, and `DIREXIO_OPENCLAW_ACP_SESSION` from the current OpenClaw runtime after pairing. Use `DIREXIO_OPENCLAW_ACP_ARGS_TOML` only when you need to provide the complete OpenClaw ACP args array yourself. Use `DIREXIO_HERMES_ACP_ARGS_TOML` for the child Hermes args; S6 prefixes the `hermes-acp-adapter -- <hermes-command>` wrapper automatically.
 
 Check status:
 

package/README_zh.md

@@ -21,6 +21,12 @@
 
 GitHub 仓库保留测试用于维护和 CI，但发布到 npm 的包以及安装到智能体 skill 目录的副本不包含 `tests/`，以减小用户安装体积。
 
+如果你想让 Codex 一句话安装并开始部署，不要说“安装 skills <GitHub 链接>”。那会触发 GitHub skill 安装器，容易安装到全局 `~/.codex`。推荐这样说：
+
+```text
+请在当前项目用 npm 安装 Direxio deployer skill：运行 npm install -g direxio-deployer@latest，然后运行 direxio-deployer skill install --agent codex --scope project --project .；不要从 GitHub 安装 skill，不要安装到全局 ~/.codex。安装后使用该 skill 部署 Direxio 服务，域名使用 __DOMAIN__。
+```
+
 POSIX shell：
 
 ```bash
@@ -51,7 +57,7 @@ direxio-deployer skill install --agent codex --scope global
 安装器会在目标目录写入 `.direxio-skill-install.json`，并拒绝覆盖没有该 manifest 的既有目录，除非显式传入 `--force`。如需固定版本，先安装指定 npm 版本：
 
 ```bash
-npm install -g direxio-deployer@0.1.1
+npm install -g direxio-deployer@0.1.2
 direxio-deployer skill update --agent codex --scope project --project .
 ```
 
@@ -117,7 +123,7 @@ bash scripts/orchestrate.sh
 ```
 
 可选安装模式：`recommended`、`cc-connect`。
-如果 `DIREXIO_AGENT_PLATFORM=auto` 无法唯一识别当前运行时，显式设置 `DIREXIO_CC_CONNECT_AGENT`。需要触发 OpenClaw 或 Hermes 默认配置时，设置 `DIREXIO_AGENT_PLATFORM=openclaw` 或 `DIREXIO_AGENT_PLATFORM=hermes`；只设置 `DIREXIO_CC_CONNECT_AGENT=acp` 会进入通用 ACP，需要手动提供 options。OpenClaw Gateway ACP 必须在完成 pairing 后，从当前 OpenClaw runtime 填写 `DIREXIO_OPENCLAW_ACP_URL`、`DIREXIO_OPENCLAW_ACP_TOKEN_FILE` 和 `DIREXIO_OPENCLAW_ACP_SESSION`。只有需要完整覆盖 OpenClaw ACP args 数组时才使用 `DIREXIO_OPENCLAW_ACP_ARGS_TOML`；Hermes 自定义参数用 `DIREXIO_HERMES_ACP_ARGS_TOML`，S6 会自动在前面加上 `hermes-acp-adapter -- <hermes-command>`。
+如果 `DIREXIO_AGENT_PLATFORM=auto` 无法唯一识别当前运行时，显式设置 `DIREXIO_CC_CONNECT_AGENT`。需要触发 OpenClaw 或 Hermes 默认配置时，设置 `DIREXIO_AGENT_PLATFORM=openclaw` 或 `DIREXIO_AGENT_PLATFORM=hermes`；只设置 `DIREXIO_CC_CONNECT_AGENT=acp` 会进入通用 ACP，需要手动提供 options。OpenClaw Gateway ACP 默认写入 `["acp", "--session", "agent:main:main"]`，让 `openclaw acp` 从 `~/.openclaw/openclaw.json` 自动发现 Gateway。需要强制指定 Gateway 时，完成 pairing 后从当前 OpenClaw runtime 同时填写 `DIREXIO_OPENCLAW_ACP_URL`、`DIREXIO_OPENCLAW_ACP_TOKEN_FILE` 和 `DIREXIO_OPENCLAW_ACP_SESSION`。只有需要完整覆盖 OpenClaw ACP args 数组时才使用 `DIREXIO_OPENCLAW_ACP_ARGS_TOML`；Hermes 自定义参数用 `DIREXIO_HERMES_ACP_ARGS_TOML`，S6 会自动在前面加上 `hermes-acp-adapter -- <hermes-command>`。
 
 查看状态：
 

package/SKILL.md

@@ -207,6 +207,18 @@ Step-by-step onboarding flow:
    - Give a short billing warning before the first mutating AWS command:
      "This will create paid AWS resources for the server. They keep billing
      until destroyed."
+   - When AWS CLI is available after credentials are verified, make a best
+     effort Free Tier account-plan check:
+     ```bash
+     aws freetier get-account-plan-state --output json
+     ```
+     If it returns `accountPlanRemainingCredits`, mention the remaining credit
+     amount and expiration without treating it as a guarantee. If the command
+     is unavailable or fails, use the fixed wording: "AWS currently advertises
+     100 USD initial credits for new customer accounts, plus possible
+     additional credits after completing Free Tier activities. These credits
+     may cover a small trial deployment, but coverage is account-specific and
+     must be verified in AWS Billing Console."
    - **Provide an upfront monthly cost estimate** based on the selected
      region and instance type, so the user can decide whether to proceed.
      `scripts/orchestrate.sh` records `cost_estimate` in state before the
@@ -252,10 +264,15 @@ Step-by-step onboarding flow:
    - If the user asks what is billed, mention EC2/server, fixed public IPv4 or
      Elastic IP, storage, DNS, network traffic, and call relay traffic.
 
-Required first-time deployment confirmation:
+Required first-time deployment confirmation. Fill in the concrete domain,
+profile, and region, and include the Free Tier sentence immediately before the
+confirmation line:
 
 ```text
-I confirm that I have an active AWS account, a real long-lived domain, and an AWS access key CSV or AWS profile for this deployment. I understand this can create billable AWS resources and that they keep billing until destroyed.
+Please confirm before I deploy. AWS new customer accounts may have Free Tier credits, currently advertised as 100 USD initial credits plus possible additional credits; these credits may cover a small trial deployment, but actual coverage must be verified in AWS Billing Console.
+
+Reply with this exact sentence:
+I confirm that I have an active AWS account, the long-lived domain <domain>, and authorize the current <profile-or-identity> AWS profile in <region> to create the Direxio service. I understand this can create billable AWS resources, credits are not guaranteed to cover all usage, and resources keep billing until destroyed.
 ```
 
 If any prerequisite is missing, stop deployment and guide the user through that
@@ -280,6 +297,13 @@ Lightsail is a future deployment mode, not a current automatic option. Lightsail
 
 When the user asks to install or update this skill itself, or asks to wire Direxio into a local agent runtime, read `references/agent-targets.md` first. It is the source of truth for connent/connect agent targets, legacy host-runtime aliases, generic targets, and unknown targets.
 
+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
+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`:
@@ -316,9 +340,9 @@ Post-deploy agent wiring is controlled by:
 ```bash
 DIREXIO_AGENT_PLATFORM=auto
 DIREXIO_CC_CONNECT_AGENT=<optional connect agent>
-DIREXIO_OPENCLAW_ACP_URL=<required for OpenClaw gateway URL>
-DIREXIO_OPENCLAW_ACP_TOKEN_FILE=<required for OpenClaw gateway token file>
-DIREXIO_OPENCLAW_ACP_SESSION=<required for OpenClaw ACP session>
+DIREXIO_OPENCLAW_ACP_URL=<optional explicit OpenClaw gateway URL>
+DIREXIO_OPENCLAW_ACP_TOKEN_FILE=<optional explicit OpenClaw gateway token file>
+DIREXIO_OPENCLAW_ACP_SESSION=<optional OpenClaw ACP session; defaults to agent:main:main>
 DIREXIO_AGENT_INSTALL=recommend
 DIREXIO_AGENT_INSTALL_MODE=recommended
 ```
@@ -327,7 +351,7 @@ The only supported local conversation bridge is `direxio-connect`, installed fro
 
 The local MCP tool surface is `direxio-mcp`, installed from `direxio-mcp@latest` by default. S6 writes `mcp/codex.toml`, `mcp/openclaw.md`, `mcp/openclaw-server.json`, `mcp/hermes.mcp.json`, `mcp/mcp-servers.json`, and `mcp/env`; these artifacts point to `credentials.json` by `DIREXIO_CREDENTIALS_FILE`. OpenClaw must be configured through the generated `openclaw mcp set` command in `mcp/openclaw.md`; do not paste MCP JSON into `~/.openclaw/openclaw.json`. Keep this separate from cc-connect: cc-connect must use its direct Matrix config and must not use `DIREXIO_CREDENTIALS_FILE`.
 
-`DIREXIO_CC_CONNECT_AGENT` is the preferred explicit selector. Supported values match connent/connect: `acp`, `antigravity`, `claudecode`, `codex`, `copilot`, `cursor`, `devin`, `gemini`, `iflow`, `kimi`, `opencode`, `pi`, `qoder`, `reasonix`, and `tmux`. Detected OpenClaw and Hermes runtimes map to `cc_connect_agent=acp`; they are not native connect agent types. OpenClaw uses `cmd = "openclaw"` but S6 requires the current agent/operator to supply the real `DIREXIO_OPENCLAW_ACP_URL`, `DIREXIO_OPENCLAW_ACP_TOKEN_FILE`, and `DIREXIO_OPENCLAW_ACP_SESSION`; do not guess these values or reuse old chat output. Hermes uses `cmd = "direxio-connect"` with `args = ["hermes-acp-adapter", "--", "hermes", "acp"]` so the Direxio compatibility layer can suppress Hermes reasoning text before it reaches the Matrix room. Use `DIREXIO_CC_CONNECT_AGENT_CMD`, `DIREXIO_<AGENT>_COMMAND`, and when needed `DIREXIO_CC_CONNECT_AGENT_OPTIONS_TOML` for agent-specific launch details. OpenClaw and Hermes also accept `DIREXIO_OPENCLAW_COMMAND`, `DIREXIO_HERMES_COMMAND`, `DIREXIO_HERMES_ACP_ADAPTER_COMMAND`, `DIREXIO_OPENCLAW_ACP_ARGS_TOML`, and `DIREXIO_HERMES_ACP_ARGS_TOML`; Hermes custom args are child Hermes args and S6 prefixes the adapter wrapper automatically.
+`DIREXIO_CC_CONNECT_AGENT` is the preferred explicit selector. Supported values match connent/connect: `acp`, `antigravity`, `claudecode`, `codex`, `copilot`, `cursor`, `devin`, `gemini`, `iflow`, `kimi`, `opencode`, `pi`, `qoder`, `reasonix`, and `tmux`. Detected OpenClaw and Hermes runtimes map to `cc_connect_agent=acp`; they are not native connect agent types. OpenClaw uses `cmd = "openclaw"` with args `["acp", "--session", "agent:main:main"]` by default, letting `openclaw acp` auto-discover the Gateway from `~/.openclaw/openclaw.json`. If the operator needs to force explicit Gateway settings, S6 requires all three real values from the current OpenClaw runtime after pairing: `DIREXIO_OPENCLAW_ACP_URL`, `DIREXIO_OPENCLAW_ACP_TOKEN_FILE`, and `DIREXIO_OPENCLAW_ACP_SESSION`; do not guess these values or reuse old chat output. Hermes uses `cmd = "direxio-connect"` with `args = ["hermes-acp-adapter", "--", "hermes", "acp"]` so the Direxio compatibility layer can suppress Hermes reasoning text before it reaches the Matrix room. Use `DIREXIO_CC_CONNECT_AGENT_CMD`, `DIREXIO_<AGENT>_COMMAND`, and when needed `DIREXIO_CC_CONNECT_AGENT_OPTIONS_TOML` for agent-specific launch details. OpenClaw and Hermes also accept `DIREXIO_OPENCLAW_COMMAND`, `DIREXIO_HERMES_COMMAND`, `DIREXIO_HERMES_ACP_ADAPTER_COMMAND`, `DIREXIO_OPENCLAW_ACP_ARGS_TOML`, and `DIREXIO_HERMES_ACP_ARGS_TOML`; Hermes custom args are child Hermes args and S6 prefixes the adapter wrapper automatically.
 
 `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.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "direxio-deployer",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Versioned Direxio deployer agent skill and portable deployment orchestration tools.",
   "type": "module",
   "bin": {

package/references/agent-targets.md

@@ -6,6 +6,12 @@ Use this file when installing or updating this skill and when reviewing S6 local
 
 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:
 
+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. For Codex, the project-local instruction is:
+
+```text
+Install the Direxio deployer skill in the current project via npm: run npm install -g direxio-deployer@latest, then run direxio-deployer skill install --agent codex --scope project --project .; do not install the skill from GitHub and do not install it globally under ~/.codex.
+```
+
 POSIX shells:
 
 ```bash
@@ -125,4 +131,4 @@ Use `mcp/codex.toml` for Codex and `mcp/hermes.mcp.json` for Hermes. For OpenCla
 
 Prefer `DIREXIO_CC_CONNECT_AGENT=<agent>` to choose the local agent that `direxio-connect` should run. Keep `DIREXIO_AGENT_PLATFORM=<runtime>` for auto-detection overrides and legacy host-runtime naming. Use `DIREXIO_AGENT_INSTALL_MODE=cc-connect` only when overriding the default `recommended` mapping explicitly.
 Use `DIREXIO_CC_CONNECT_AGENT_OPTIONS_TOML` for agent-specific options that cannot be represented by `work_dir` or `cmd`; for example `reasonix` requires `serve_url`, `tmux` requires `session`, and generic `acp` requires a command when `DIREXIO_CC_CONNECT_AGENT_CMD` is not enough.
-For OpenClaw Gateway ACP, complete OpenClaw pairing first, then set `DIREXIO_OPENCLAW_ACP_URL`, `DIREXIO_OPENCLAW_ACP_TOKEN_FILE`, and `DIREXIO_OPENCLAW_ACP_SESSION` from the current OpenClaw runtime. S6 writes `["acp", "--url", <url>, "--token-file", <local path>, "--session", <session>]` and converts the token-file with `DIREXIO_LOCAL_PATH_STYLE`. `DIREXIO_OPENCLAW_ACP_ARGS_TOML` replaces the OpenClaw ACP args array only when the runtime needs a fully custom argument list. `DIREXIO_HERMES_ACP_ARGS_TOML` supplies the child Hermes args and keeps the Direxio adapter prefix.
+For OpenClaw Gateway ACP, S6 defaults to `["acp", "--session", "agent:main:main"]` and lets `openclaw acp` auto-discover the Gateway from `~/.openclaw/openclaw.json`. To force an explicit Gateway, complete OpenClaw pairing first, then set all of `DIREXIO_OPENCLAW_ACP_URL`, `DIREXIO_OPENCLAW_ACP_TOKEN_FILE`, and `DIREXIO_OPENCLAW_ACP_SESSION` from the current OpenClaw runtime. S6 writes `["acp", "--url", <url>, "--token-file", <local path>, "--session", <session>]` and converts the token-file with `DIREXIO_LOCAL_PATH_STYLE`. `DIREXIO_OPENCLAW_ACP_ARGS_TOML` replaces the OpenClaw ACP args array only when the runtime needs a fully custom argument list. `DIREXIO_HERMES_ACP_ARGS_TOML` supplies the child Hermes args and keeps the Direxio adapter prefix.

package/references/deployment-workflow.md

@@ -55,9 +55,13 @@ bash scripts/pricing-estimate.sh --state ~/.direxio/nodes/<service_id>/state.jso
 selection and refreshes it in S3 after the final EC2 instance type is known.
 The estimate includes EC2, gp3 storage, public IPv4, and Route53 hosted-zone
 cost when applicable. It excludes data transfer, TURN relay traffic, domain
-registration, taxes, and AWS credits. Credit coverage is not guaranteed; verify
-credits and actual charges in AWS Billing Console, and set an AWS Budget or
-billing alert before leaving the node running.
+registration, taxes, and AWS credits. When available, check the Free Tier
+account plan with `aws freetier get-account-plan-state --output json`;
+otherwise tell the user that AWS currently advertises 100 USD initial credits
+for new customer accounts plus possible additional credits after Free Tier
+activities. Credit coverage is not guaranteed; verify credits and actual
+charges in AWS Billing Console, and set an AWS Budget or billing alert before
+leaving the node running.
 
 ## Destroy
 

package/references/runtime-wiring.md

@@ -112,9 +112,9 @@ DIREXIO_<AGENT>_COMMAND=<optional agent-specific executable path>
 DIREXIO_CC_CONNECT_AGENT_OPTIONS_TOML=<optional extra TOML under projects.agent.options>
 DIREXIO_OPENCLAW_COMMAND=<optional OpenClaw executable path>
 DIREXIO_HERMES_COMMAND=<optional Hermes executable path>
-DIREXIO_OPENCLAW_ACP_URL=<required OpenClaw gateway URL>
-DIREXIO_OPENCLAW_ACP_TOKEN_FILE=<required OpenClaw ACP token file>
-DIREXIO_OPENCLAW_ACP_SESSION=<required OpenClaw ACP session>
+DIREXIO_OPENCLAW_ACP_URL=<optional explicit OpenClaw gateway URL>
+DIREXIO_OPENCLAW_ACP_TOKEN_FILE=<optional explicit OpenClaw ACP token file>
+DIREXIO_OPENCLAW_ACP_SESSION=<optional OpenClaw ACP session; defaults to agent:main:main>
 DIREXIO_OPENCLAW_ACP_ARGS_TOML=<optional OpenClaw ACP TOML array>
 DIREXIO_HERMES_ACP_ARGS_TOML=<optional Hermes ACP TOML array>
 DIREXIO_CC_CONNECT_NPM_PACKAGE=direxio-connent@latest
@@ -131,11 +131,11 @@ DIREXIO_SPEECH_LANGUAGE=zh
 Defaults:
 
 - `DIREXIO_CC_CONNECT_AGENT` is the preferred explicit selector. It accepts every connent/connect agent: `acp`, `antigravity`, `claudecode`, `codex`, `copilot`, `cursor`, `devin`, `gemini`, `iflow`, `kimi`, `opencode`, `pi`, `qoder`, `reasonix`, and `tmux`.
-- `DIREXIO_AGENT_PLATFORM=auto` detects the local agent runtime and maps it to a `direxio-connect` agent type only when it can identify one unambiguously. OpenClaw and Hermes map to the generic `acp` connect agent. OpenClaw requires explicit real ACP Gateway settings from the current runtime; Hermes uses the `direxio-connect hermes-acp-adapter -- hermes acp` compatibility wrapper by default.
+- `DIREXIO_AGENT_PLATFORM=auto` detects the local agent runtime and maps it to a `direxio-connect` agent type only when it can identify one unambiguously. OpenClaw and Hermes map to the generic `acp` connect agent. OpenClaw uses `openclaw acp --session agent:main:main` by default and lets OpenClaw discover its Gateway config; Hermes uses the `direxio-connect hermes-acp-adapter -- hermes acp` compatibility wrapper by default.
 - `DIREXIO_LOCAL_PATH_STYLE=windows` writes Windows-compatible `data_dir`, `work_dir`, config paths, and install commands. `scripts/orchestrate.ps1` sets this automatically. Linux, macOS, and WSL Bash runs should leave the default `posix` style. Windows Git Bash/MSYS2 users who run `scripts/orchestrate.sh` directly must set `DIREXIO_LOCAL_PATH_STYLE=windows` when the local bridge is a Windows process.
 - `DIREXIO_CC_CONNECT_AGENT_CMD` writes `cmd = "<path>"` into `[projects.agent.options]`. Agent-specific forms such as `DIREXIO_CODEX_COMMAND`, `DIREXIO_CLAUDE_CODE_COMMAND`, `DIREXIO_GEMINI_COMMAND`, `DIREXIO_OPENCODE_COMMAND`, `DIREXIO_QODERCLI_COMMAND`, and `DIREXIO_OPENCLAW_COMMAND` are also accepted. For Hermes, `DIREXIO_HERMES_COMMAND` selects the child Hermes executable behind the adapter, while `DIREXIO_HERMES_ACP_ADAPTER_COMMAND` overrides the adapter command itself.
 - `DIREXIO_CC_CONNECT_AGENT_OPTIONS_TOML` appends agent-specific options under `[projects.agent.options]`; use it for agents with required non-command options such as `reasonix` (`serve_url`) or `tmux` (`session`).
-- OpenClaw Gateway ACP uses `DIREXIO_OPENCLAW_ACP_URL`, `DIREXIO_OPENCLAW_ACP_TOKEN_FILE`, and `DIREXIO_OPENCLAW_ACP_SESSION` to write `--url`, `--token-file`, and `--session`. Complete OpenClaw pairing first and use the real session that should receive Direxio messages; do not guess a default session or reuse old chat output.
+- OpenClaw Gateway ACP auto-detects the Gateway from `~/.openclaw/openclaw.json` when `DIREXIO_OPENCLAW_ACP_URL` and `DIREXIO_OPENCLAW_ACP_TOKEN_FILE` are unset. It uses `DIREXIO_OPENCLAW_ACP_SESSION` when provided, otherwise `agent:main:main`. To force explicit Gateway settings, complete OpenClaw pairing first and set all three real values: `DIREXIO_OPENCLAW_ACP_URL`, `DIREXIO_OPENCLAW_ACP_TOKEN_FILE`, and `DIREXIO_OPENCLAW_ACP_SESSION`.
 - `DIREXIO_OPENCLAW_ACP_ARGS_TOML` replaces the generated OpenClaw ACP args array, for example `["acp", "--url", "wss://gateway.example.test:18789", "--token-file", "$HOME/.openclaw/gateway.token", "--session", "agent:main:main"]`. `DIREXIO_HERMES_ACP_ARGS_TOML` supplies the child Hermes args; S6 prefixes `["hermes-acp-adapter", "--", "<hermes-command>"]` automatically.
 - `DIREXIO_AGENT_INSTALL=recommend` prints and records the command only.
 - `DIREXIO_AGENT_INSTALL=auto` runs `npm install -g direxio-connent@latest` and then installs the `direxio-connect` daemon with the generated config and `--service-name <service_id>`. It is recorded as installed only when `direxio-connect daemon status --service-name <service_id>` reports `Status: Running` and recent daemon logs do not show ACP session initialization failure; otherwise S6 records `agent_install_status=install_failed`.

package/scripts/mcp-tools-list.mjs

@@ -26,6 +26,7 @@ child.stderr.on("data", (chunk) => {
 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 : [];
@@ -60,35 +61,78 @@ send({ jsonrpc: "2.0", method: "notifications/initialized", params: {} });
 send({ jsonrpc: "2.0", id: 2, method: "tools/list", params: {} });
 
 function send(message) {
-  child.stdin.write(`${JSON.stringify(message)}\n`);
+  const body = JSON.stringify(message);
+  child.stdin.write(`Content-Length: ${Buffer.byteLength(body, "utf8")}\r\n\r\n${body}`);
 }
 
 function readFrames() {
   while (true) {
-    const headerEnd = stdout.indexOf("\r\n\r\n");
-    if (headerEnd >= 0) {
-      const header = stdout.subarray(0, headerEnd).toString("utf8");
-      const match = /^Content-Length:\s*(\d+)/im.exec(header);
-      if (match) {
-        const length = Number.parseInt(match[1], 10);
-        const bodyStart = headerEnd + 4;
-        if (stdout.length < bodyStart + length) return;
-        const body = stdout.subarray(bodyStart, bodyStart + length).toString("utf8");
-        stdout = stdout.subarray(bodyStart + length);
-        recordMessage(JSON.parse(body));
-        continue;
+    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;
     }
+
     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;
-    recordMessage(JSON.parse(line));
+    handleMessage(line);
+    if (completed) return;
+  }
+}
+
+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);
+  }
+  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);
   }
+  return NaN;
 }
 
-function recordMessage(message) {
+function handleMessage(raw) {
+  let message;
+  try {
+    message = JSON.parse(raw);
+  } catch (error) {
+    finishWithError(`invalid MCP JSON response: ${error.message}`);
+    return;
+  }
   if (typeof message.id !== "undefined") {
     responses.set(message.id, message);
   }

package/scripts/orchestrate.sh

@@ -395,6 +395,25 @@ ensure_cost_estimate() {
   else
     warn "Could not write AWS cost estimate. Continue only after giving the user a manual billing estimate."
   fi
+  ensure_free_tier_credit_notice
+}
+
+ensure_free_tier_credit_notice() {
+  local output plan_status plan_type amount unit expires
+  if output=$(aws freetier get-account-plan-state --output json 2>/dev/null); then
+    plan_type=$(printf '%s\n' "$output" | json_stdin_get accountPlanType "unknown" 2>/dev/null)
+    plan_status=$(printf '%s\n' "$output" | json_stdin_get accountPlanStatus "unknown" 2>/dev/null)
+    amount=$(printf '%s\n' "$output" | json_stdin_get accountPlanRemainingCredits.amount "" 2>/dev/null)
+    unit=$(printf '%s\n' "$output" | json_stdin_get accountPlanRemainingCredits.unit "USD" 2>/dev/null)
+    expires=$(printf '%s\n' "$output" | json_stdin_get accountPlanExpirationDate "" 2>/dev/null)
+    if [ -n "$amount" ]; then
+      log "AWS Free Tier plan: type=${plan_type:-unknown}, status=${plan_status:-unknown}, remaining_credits=${amount} ${unit:-USD}${expires:+, expires=$expires}."
+      warn "Credits can reduce actual charges, but AWS resources still accrue charges until destroyed; verify credit coverage in AWS Billing Console."
+      return 0
+    fi
+  fi
+  warn "AWS new customer accounts may include Free Tier credits, currently advertised as 100 USD initial credits plus possible additional credits."
+  warn "Credits may cover a small trial deployment, but coverage is account-specific; verify credits in AWS Billing Console and destroy the node when finished."
 }
 
 precheck_new_deploy_domain_env() {

package/scripts/phases/s6_wire_local.sh

@@ -572,15 +572,21 @@ _openclaw_acp_args_toml() {
   url=${DIREXIO_OPENCLAW_ACP_URL:-}
   token_file=${DIREXIO_OPENCLAW_ACP_TOKEN_FILE:-}
   session=${DIREXIO_OPENCLAW_ACP_SESSION:-}
-  [ -n "$url" ] || missing="${missing} DIREXIO_OPENCLAW_ACP_URL"
-  [ -n "$token_file" ] || missing="${missing} DIREXIO_OPENCLAW_ACP_TOKEN_FILE"
-  [ -n "$session" ] || missing="${missing} DIREXIO_OPENCLAW_ACP_SESSION"
-  if [ -n "$missing" ]; then
-    fail "OpenClaw ACP requires real Gateway settings:${missing}. Set them from the current OpenClaw runtime, or provide DIREXIO_OPENCLAW_ACP_ARGS_TOML with the complete args array."
+  if [ -n "$url" ] && [ -n "$token_file" ] && [ -n "$session" ]; then
+    token_file=$(_local_connect_path "$token_file")
+    _toml_array acp --url "$url" --token-file "$token_file" --session "$session"
+    return 0
+  fi
+  if [ -n "$url" ] || [ -n "$token_file" ]; then
+    [ -n "$url" ] || missing="${missing} DIREXIO_OPENCLAW_ACP_URL"
+    [ -n "$token_file" ] || missing="${missing} DIREXIO_OPENCLAW_ACP_TOKEN_FILE"
+    [ -n "$session" ] || missing="${missing} DIREXIO_OPENCLAW_ACP_SESSION"
+    fail "OpenClaw ACP explicit Gateway settings are incomplete:${missing}. Set all of DIREXIO_OPENCLAW_ACP_URL, DIREXIO_OPENCLAW_ACP_TOKEN_FILE, and DIREXIO_OPENCLAW_ACP_SESSION; otherwise leave URL/token-file unset so openclaw acp can auto-detect from its config."
     return 1
   fi
-  token_file=$(_local_connect_path "$token_file")
-  _toml_array acp --url "$url" --token-file "$token_file" --session "$session"
+  # Fallback: OpenClaw acp auto-discovers gateway from ~/.openclaw/openclaw.json.
+  warn "OpenClaw ACP: Gateway URL/token-file not set; using session '${session:-agent:main:main}' and letting openclaw acp auto-detect the Gateway from its config."
+  _toml_array acp --session "${session:-agent:main:main}"
 }
 
 _hermes_acp_args_toml() {