subconscious-cli 0.3.0 → 0.3.1

package/bin/runbook/cursor/install.sh

@@ -16,7 +16,7 @@
 # Equivalent manual setup (three pieces):
 #
 #   1. Cursor settings → enable "OpenAI API Key Override":
-#        Base URL: https://your-gateway.example
+#        Base URL: https://your-gateway.example/v1
 #        API Key:  sk-gw-...
 #
 #   2. Write ~/.cursor/hooks.json pointing at the hook script:
@@ -46,28 +46,44 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 HOOK_SRC="${SCRIPT_DIR}/hook.sh"
 HOOKS_TEMPLATE="${SCRIPT_DIR}/hooks.json"
 
-# Load shared env from coding-agents/.env (gitignored) or env.example.
-SHARED_ENV="${MBTA_ENV_FILE:-${SCRIPT_DIR}/../.env}"
+# Load shared env from SUBC_ENV_FILE, or a sibling .env / env.example.
+SHARED_ENV="${SUBC_ENV_FILE:-${SCRIPT_DIR}/../.env}"
 [[ -f "$SHARED_ENV" ]] || SHARED_ENV="${SCRIPT_DIR}/../env.example"
 if [[ -f "$SHARED_ENV" ]]; then set -a; source "$SHARED_ENV"; set +a; fi
 
 GATEWAY_URL="${GATEWAY_URL:-}"
 API_KEY="${CURSOR_API_KEY:-${API_KEY:-}}"
+MODEL="${MODEL:-subconscious/glm-5.2}"
 COMMAND="install"
 
+DEFAULT_SUBCONSCIOUS_MODELS="subconscious/glm-5.2
+subconscious/tim-qwen3.6-27b
+subconscious/deepseek-v4-flash-marathon"
+
+SUPPORTED_MODELS=()
+add_supported_model() {
+  local model_id="$1"
+  for existing in "${SUPPORTED_MODELS[@]:-}"; do
+    [[ "$existing" == "$model_id" ]] && return
+  done
+  SUPPORTED_MODELS+=("$model_id")
+}
+add_supported_model "$MODEL"
+while IFS= read -r model_id; do
+  [[ -n "$model_id" ]] && add_supported_model "$model_id"
+done <<< "${SUBCONSCIOUS_MODELS:-$DEFAULT_SUBCONSCIOUS_MODELS}"
+
 usage() {
   cat <<'EOF'
 Usage:
-  install.sh [install] --gateway-url URL --api-key KEY
-  install.sh uninstall
-  install.sh status
-
-`install` is the default subcommand and may be omitted.
+  subc cursor install [--gateway-url URL] [--api-key KEY]
+  subc cursor uninstall
+  subc cursor status
 
 Installs Cursor hooks (user-wide under ~/.cursor) that POST to /v1/agent-hooks:
 conversation_ensure on each prompt submission so the gateway can group
 Conversations for Cursor traffic, and conversation_compaction on preCompact so
-context accounting restarts at the right turn.
+context accounting restarts at the right turn. Existing hook entries are kept.
 
 Requires: jq, curl. Restart Cursor after install.
 EOF
@@ -121,7 +137,7 @@ require_cmds() {
 write_env() {
   umask 077
   cat >"$ENV_FILE" <<EOF
-# Generated by ol-runbook/coding-agents/cursor/install.sh — do not commit secrets.
+# Generated by subc — do not commit secrets.
 export SUBCONSCIOUS_GATEWAY_URL='${GATEWAY_URL}'
 export SUBCONSCIOUS_API_KEY='${API_KEY}'
 EOF
@@ -247,7 +263,16 @@ case "$COMMAND" in
     write_env
     merge_hooks_json
     echo "Installed Subconscious Cursor hooks into $CURSOR_DIR"
-    echo "Restart Cursor to reload hooks.json."
+    echo ""
+    echo "Finish in Cursor Settings"
+    echo "  Enable OpenAI API Key Override, then use:"
+    echo "    Base URL: ${GATEWAY_URL%/}/v1"
+    echo "  Add the available custom models:"
+    for model_id in "${SUPPORTED_MODELS[@]}"; do
+      echo "    ${model_id}"
+    done
+    echo "  Select ${MODEL} for this profile."
+    echo "  Paste your Subconscious API key there, then fully restart Cursor."
     ;;
   uninstall)
     uninstall_hooks

package/bin/runbook/opencode/install.sh

@@ -55,8 +55,8 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-# Load shared env from coding-agents/.env (gitignored) or env.example.
-SHARED_ENV="${MBTA_ENV_FILE:-${SCRIPT_DIR}/../.env}"
+# Load shared env from SUBC_ENV_FILE, or a sibling .env / env.example.
+SHARED_ENV="${SUBC_ENV_FILE:-${SCRIPT_DIR}/../.env}"
 [[ -f "$SHARED_ENV" ]] || SHARED_ENV="${SCRIPT_DIR}/../env.example"
 if [[ -f "$SHARED_ENV" ]]; then set -a; source "$SHARED_ENV"; set +a; fi
 
@@ -72,23 +72,12 @@ OUTPUT_LIMIT="${OPENCODE_OUTPUT_LIMIT:-65536}"
 usage() {
   cat <<'EOF'
 Usage:
-  install.sh [install] --gateway-url URL --api-key KEY [--model MODEL]
-             [--context-limit N] [--output-limit N]
-  install.sh uninstall
-  install.sh status
+  subc opencode status
+  subc opencode uninstall
+  subc opencode help
 
-`install` is the default subcommand and may be omitted.
-
-Writes an opencode.json that points opencode at your Subconscious gateway with
-x-subconscious-client: opencode and x-session-affinity/x-session-id session
-headers so the gateway can group requests into Conversations.
-
-Also sets model limit.context / limit.output so OpenCode auto-compaction
-respects the gateway window (compaction.auto stays enabled / default), and
-installs a plugin that reports compactions so the dashboard can restart context
-accounting at the right turn.
-
-Requires: jq. Restart opencode after install.
+OpenCode is launch-only: subc opencode. Uninstall removes only the Subconscious
+provider, plugin, and env file. It does not delete ~/.opencode/opencode.json.
 EOF
 }
 
@@ -190,35 +179,40 @@ require_cmds() {
 write_config() {
   mkdir -p "$OPENCODE_DIR"
   local base_url="${GATEWAY_URL%/}/v1"
-  local config
-  config=$(cat <<EOF
+  local provider
+  provider=$(cat <<EOF
 {
-  "\$schema": "https://opencode.ai/config.json",
-  "provider": {
-    "subconscious": {
-      "npm": "@ai-sdk/openai-compatible",
-      "name": "Subconscious Gateway",
-      "options": {
-        "baseURL": "${base_url}",
-        "apiKey": "{env:SUBCONSCIOUS_API_KEY}",
-        "headers": {
-          "x-subconscious-client": "opencode"
-        }
-      },
-      "models": {${MODELS_JSON}}
+  "npm": "@ai-sdk/openai-compatible",
+  "name": "Subconscious Gateway",
+  "options": {
+    "baseURL": "${base_url}",
+    "apiKey": "{env:SUBCONSCIOUS_API_KEY}",
+    "headers": {
+      "x-subconscious-client": "opencode"
     }
   },
-  "model": "subconscious/${MODEL}"
+  "models": {${MODELS_JSON}}
 }
 EOF
 )
-  echo "$config" >"$OPENCODE_CONFIG"
-  # Also export the API key into the shell env file for interactive sessions. The plugin
-  # reads the gateway URL from the same file.
+  if [[ -f "$OPENCODE_CONFIG" ]]; then
+    local tmp
+    tmp="$(mktemp)"
+    jq --argjson provider "$provider" --arg model "subconscious/${MODEL}" '
+      .provider = (.provider // {})
+      | .provider.subconscious = $provider
+      | .model = $model
+    ' "$OPENCODE_CONFIG" >"$tmp"
+    mv "$tmp" "$OPENCODE_CONFIG"
+  else
+    jq -n --argjson provider "$provider" --arg model "subconscious/${MODEL}" \
+      '{ "$schema": "https://opencode.ai/config.json", provider: {subconscious: $provider}, model: $model }' \
+      >"$OPENCODE_CONFIG"
+  fi
   local env_file="${OPENCODE_DIR}/subconscious.env"
   umask 077
   cat >"$env_file" <<EOF
-# Generated by ol-runbook/coding-agents/opencode/install.sh — do not commit secrets.
+# Generated by subc — do not commit secrets.
 export SUBCONSCIOUS_API_KEY='${API_KEY}'
 export SUBCONSCIOUS_GATEWAY_URL='${GATEWAY_URL%/}'
 EOF
@@ -235,8 +229,17 @@ write_plugin() {
 }
 
 uninstall_config() {
-  if [[ -f "$OPENCODE_CONFIG" ]] && grep -q "$MARKER" "$OPENCODE_CONFIG" 2>/dev/null; then
-    rm -f "$OPENCODE_CONFIG"
+  if [[ -f "$OPENCODE_CONFIG" ]]; then
+    local tmp
+    tmp="$(mktemp)"
+    jq '
+      del(.provider.subconscious)
+      | if ((.model // "") | tostring | startswith("subconscious/")) then del(.model) else . end
+    ' "$OPENCODE_CONFIG" >"$tmp"
+    mv "$tmp" "$OPENCODE_CONFIG"
+    echo "Removed Subconscious provider from $OPENCODE_CONFIG"
+  else
+    echo "No OpenCode config at $OPENCODE_CONFIG"
   fi
   rm -f "${OPENCODE_DIR}/subconscious.env"
   rm -f "$PLUGIN_FILE"
@@ -279,18 +282,15 @@ case "$COMMAND" in
     fi
     write_config
     write_plugin
-    echo "Installed Subconscious OpenCode config at $OPENCODE_CONFIG"
+    echo "Merged Subconscious OpenCode provider into $OPENCODE_CONFIG"
     if [[ -f "$PLUGIN_FILE" ]]; then
       echo "Installed compaction reporting plugin at $PLUGIN_FILE"
     fi
-    echo "Source the env file before launching opencode:"
-    echo "  source ${OPENCODE_DIR}/subconscious.env"
-    echo "Or export SUBCONSCIOUS_API_KEY in your shell profile."
-    echo "Restart any running opencode sessions."
+    echo "Launch OpenCode with: subc opencode"
     ;;
   uninstall)
     uninstall_config
-    echo "Removed Subconscious OpenCode config from $OPENCODE_DIR"
+    echo "Removed Subconscious OpenCode files; left $OPENCODE_CONFIG in place"
     ;;
   status)
     status

package/bin/runbook/opencode/run.sh

@@ -10,7 +10,7 @@
 #   ./run.sh -- auth                 # pass args through to opencode
 #
 # Config: copy ../env.example to ../.env and edit. .env is gitignored.
-# All agents share one coding-agents/.env file.
+# Profile env is injected by subc. A sibling .env is only used when SUBC_ENV_FILE is unset.
 #
 # Or source it to just export the env:
 #   source run.sh
@@ -19,8 +19,8 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-# Load shared env from coding-agents/.env (gitignored) or env.example.
-SHARED_ENV="${MBTA_ENV_FILE:-${SCRIPT_DIR}/../.env}"
+# Load shared env from SUBC_ENV_FILE, or a sibling .env / env.example.
+SHARED_ENV="${SUBC_ENV_FILE:-${SCRIPT_DIR}/../.env}"
 [[ -f "$SHARED_ENV" ]] || SHARED_ENV="${SCRIPT_DIR}/../env.example"
 if [[ -f "$SHARED_ENV" ]]; then set -a; source "$SHARED_ENV"; set +a; fi
 
@@ -91,8 +91,7 @@ fi
 BASE_URL="${GATEWAY_URL%/}/v1"
 
 export SUBCONSCIOUS_API_KEY="$API_KEY"
-# Read by the compaction plugin when it is installed. run.sh writes nothing to disk, so
-# use install.sh if you want compaction reporting.
+# Compaction reporting needs the plugin on disk; this launch path writes nothing.
 export SUBCONSCIOUS_GATEWAY_URL="${GATEWAY_URL%/}"
 export OPENCODE_CONFIG_CONTENT=$(cat <<EOF
 {"\$schema":"https://opencode.ai/config.json","provider":{"subconscious":{"npm":"@ai-sdk/openai-compatible","name":"Subconscious Gateway","options":{"baseURL":"${BASE_URL}","apiKey":"{env:SUBCONSCIOUS_API_KEY}","headers":{"x-subconscious-client":"opencode"}},"models":{${MODELS_JSON}}}},"model":"subconscious/${MODEL}"}

package/bin/runbook/pi/install.sh

@@ -49,8 +49,8 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 EXTENSION_SRC="${SCRIPT_DIR}/subconscious-compaction.ts"
 
-# Load shared env from coding-agents/.env (gitignored) or env.example.
-SHARED_ENV="${MBTA_ENV_FILE:-${SCRIPT_DIR}/../.env}"
+# Load shared env from SUBC_ENV_FILE, or a sibling .env / env.example.
+SHARED_ENV="${SUBC_ENV_FILE:-${SCRIPT_DIR}/../.env}"
 [[ -f "$SHARED_ENV" ]] || SHARED_ENV="${SCRIPT_DIR}/../env.example"
 if [[ -f "$SHARED_ENV" ]]; then set -a; source "$SHARED_ENV"; set +a; fi
 
@@ -64,26 +64,13 @@ MAX_TOKENS="${PI_MAX_TOKENS:-65536}"
 usage() {
   cat <<'EOF'
 Usage:
-  install.sh [install] --gateway-url URL --api-key KEY [--model MODEL]
+  subc pi install [--gateway-url URL] [--api-key KEY] [--model MODEL]
              [--context-window N] [--max-tokens N]
-  install.sh uninstall
-  install.sh status
+  subc pi uninstall
+  subc pi status
 
-`install` is the default subcommand and may be omitted.
-
-Writes a models.json that points Pi at your Subconscious gateway with
-x-subconscious-client: pi and session-affinity headers enabled so the gateway
-can group requests into Conversations.
-
-Also sets model contextWindow (default 5000000) so Pi auto-compaction
-(`contextTokens > contextWindow - reserveTokens`) respects the gateway window,
-and installs an extension that reports compactions so the dashboard can restart
-context accounting at the right turn.
-
-Pi does not send session headers by default; this script enables
-sendSessionAffinityHeaders with sessionAffinityFormat "openai-nosession"
-(sends x-session-affinity without the underscore session_id header that
-strict proxies may drop).
+Merges a Subconscious provider into ~/.pi/agent/models.json without replacing
+other providers. Launch Pi with subc pi after install.
 
 Requires: jq. Restart Pi after install (or /reload for the extension).
 EOF
@@ -115,7 +102,7 @@ while [[ $# -gt 0 ]]; do
       MAX_TOKENS="${2:-}"
       shift 2
       ;;
-    -h|--help)
+    -h|--help|help)
       usage
       exit 0
       ;;
@@ -185,29 +172,35 @@ require_cmds() {
 write_config() {
   mkdir -p "$PI_DIR"
   local base_url="${GATEWAY_URL%/}/v1"
-  local config
-  config=$(cat <<EOF
+  local provider
+  provider=$(cat <<EOF
 {
-  "providers": {
-    "subconscious": {
-      "baseUrl": "${base_url}",
-      "api": "openai-completions",
-      "apiKey": "${API_KEY}",
-      "headers": {
-        "x-subconscious-client": "pi"
-      },
-      "models": [${MODEL_ENTRIES_JSON}]
-    }
-  }
+  "baseUrl": "${base_url}",
+  "api": "openai-completions",
+  "apiKey": "${API_KEY}",
+  "headers": {
+    "x-subconscious-client": "pi"
+  },
+  "models": [${MODEL_ENTRIES_JSON}]
 }
 EOF
 )
-  echo "$config" >"$MODELS_JSON"
+  if [[ -f "$MODELS_JSON" ]]; then
+    local tmp
+    tmp="$(mktemp)"
+    jq --argjson provider "$provider" '
+      .providers = (.providers // {})
+      | .providers.subconscious = $provider
+    ' "$MODELS_JSON" >"$tmp"
+    mv "$tmp" "$MODELS_JSON"
+  else
+    jq -n --argjson provider "$provider" '{providers: {subconscious: $provider}}' >"$MODELS_JSON"
+  fi
   chmod 600 "$MODELS_JSON"
 
   umask 077
   cat >"$ENV_FILE" <<EOF
-# Generated by ol-runbook/coding-agents/pi/install.sh — do not commit secrets.
+# Generated by subc — do not commit secrets.
 # Loaded by subconscious-compaction.ts if process env is unset.
 export SUBCONSCIOUS_GATEWAY_URL='${GATEWAY_URL%/}'
 export SUBCONSCIOUS_API_KEY='${API_KEY}'
@@ -225,11 +218,14 @@ write_extension() {
 }
 
 uninstall_config() {
-  if [[ -f "$MODELS_JSON" ]] && grep -q "$MARKER" "$MODELS_JSON" 2>/dev/null; then
-    rm -f "$MODELS_JSON"
-    echo "Removed $MODELS_JSON"
+  if [[ -f "$MODELS_JSON" ]]; then
+    local tmp
+    tmp="$(mktemp)"
+    jq 'del(.providers.subconscious)' "$MODELS_JSON" >"$tmp"
+    mv "$tmp" "$MODELS_JSON"
+    echo "Removed Subconscious provider from $MODELS_JSON"
   else
-    echo "No Subconscious Pi config found at $MODELS_JSON"
+    echo "No Pi models.json at $MODELS_JSON"
   fi
   rm -f "$EXTENSION_DST" "$ENV_FILE"
 }
@@ -266,7 +262,7 @@ case "$COMMAND" in
     fi
     write_config
     write_extension
-    echo "Installed Subconscious Pi config at $MODELS_JSON"
+    echo "Merged Subconscious Pi provider into $MODELS_JSON"
     if [[ -f "$EXTENSION_DST" ]]; then
       echo "Installed compaction reporting extension at $EXTENSION_DST"
     fi

package/bin/runbook/pi/run.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Launch Pi with the Subconscious provider configured by `subc setup`.
+# Launch Pi with the Subconscious provider configured by `subc pi install`.
 # This script is deliberately read-only: it never installs Pi, writes config,
 # or updates the persistent integration.
 
@@ -10,7 +10,7 @@ PI_DIR="${PI_CODING_AGENT_DIR:-${HOME}/.pi/agent}"
 MODELS_JSON="${PI_DIR}/models.json"
 
 if [[ ! -f "$MODELS_JSON" ]] || ! grep -q 'x-subconscious-client' "$MODELS_JSON" 2>/dev/null; then
-  echo "Pi is not configured for Subconscious. Run 'subc setup' first." >&2
+  echo "Pi is not configured for Subconscious. Run 'subc pi install' first." >&2
   exit 1
 fi
 
@@ -18,7 +18,7 @@ if command -v jq >/dev/null 2>&1 && ! jq -e \
   --arg model "$MODEL" \
   '.providers.subconscious.models[]? | select(.id == $model)' \
   "$MODELS_JSON" >/dev/null 2>&1; then
-  echo "Model '$MODEL' is not present in the Pi catalog. Run 'subc setup' to refresh it." >&2
+  echo "Model '$MODEL' is not present in the Pi catalog. Run 'subc pi install' to refresh it." >&2
   exit 1
 fi
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "subconscious-cli",
-  "version": "0.3.0",
-  "description": "CLI for Subconscious — run Claude Code, Codex, OpenCode, Cursor, Copilot, and Pi with ol-runbook integrations",
+  "version": "0.3.1",
+  "description": "CLI for Subconscious — run Claude Code, Codex, OpenCode, Cursor, Copilot, and Pi",
   "bin": {
     "subc": "./bin/cli.js"
   },