claude-bot/EJClaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: replace all node/npm/tsx references with bun across codebase

Browse Source 
- Source: setup/service.ts, runners.ts, agent-runner.ts error messages
- Scripts: restart-stack.sh, run-migrations.ts → bun
- Bootstrap: setup.sh check_node→check_bun, npm install→bun install
- Docs: CLAUDE.md, README.md, all SKILL.md files
- Tests: service.test.ts, restart-stack.test.ts expectations updated
This commit is contained in:
Eyejoker
2026-03-31 00:10:23 +09:00
parent 0112f5a2d6
commit 35ba7cb5ba
23 changed files with 102 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.claude/skills/add-compact/SKILL.md
View File

@@ -31,10 +31,10 @@ description: Verify or port the existing /compact session command in current EJC
## 검증 ## 검증
```bash ```bash
npm run typecheck bun run typecheck
npm test bun test
npm run build:runners bun run build:runners
npm run build bun run build
``` ```
그 다음 디스코드에서 확인합니다. 그 다음 디스코드에서 확인합니다.

14
.claude/skills/add-discord/SKILL.md
View File

@@ -13,7 +13,7 @@ description: Finish Discord bot setup and registration for EJClaw.
- `src/channels/discord.ts`가 존재하는지 - `src/channels/discord.ts`가 존재하는지
- `package.json`에 `discord.js`가 있는지 - `package.json`에 `discord.js`가 있는지
- `npm run typecheck`가 통과하는지 - `bun run typecheck`가 통과하는지
## 2. 봇 토큰 준비 ## 2. 봇 토큰 준비
@@ -47,7 +47,7 @@ DISCORD_CODEX_BOT_TOKEN=<second-token>
메인 채널: 메인 채널:
```bash ```bash
npm run setup -- --step register -- \ bun run setup -- --step register -- \
--jid dc:<channel-id> \ --jid dc:<channel-id> \
--name "<server-name> #<channel-name>" \ --name "<server-name> #<channel-name>" \
--folder discord_main \ --folder discord_main \
@@ -59,7 +59,7 @@ npm run setup -- --step register -- \
보조 채널: 보조 채널:
```bash ```bash
npm run setup -- --step register -- \ bun run setup -- --step register -- \
--jid dc:<channel-id> \ --jid dc:<channel-id> \
--name "<server-name> #<channel-name>" \ --name "<server-name> #<channel-name>" \
--folder discord_<channel-name> \ --folder discord_<channel-name> \
@@ -69,10 +69,10 @@ npm run setup -- --step register -- \
## 5. 빌드와 검증 ## 5. 빌드와 검증
```bash ```bash
npm run build bun run build
npm run build:runners bun run build:runners
npm run setup -- --step service bun run setup -- --step service
npm run setup -- --step verify bun run setup -- --step verify
``` ```
필요하면 로그 확인: 필요하면 로그 확인:

6
.claude/skills/add-ollama-tool/SKILL.md
View File

@@ -61,9 +61,9 @@ ollama pull llama3.2
## 4. 빌드와 검증 ## 4. 빌드와 검증
```bash ```bash
npm run build:runners bun run build:runners
npm run build bun run build
npm run setup -- --step service bun run setup -- --step service
``` ```
디스코드에서 테스트: 디스코드에서 테스트:

6
.claude/skills/add-parallel/SKILL.md
View File

@@ -48,9 +48,9 @@ PARALLEL_API_KEY=...
## 5. 빌드와 검증 ## 5. 빌드와 검증
```bash ```bash
npm run build:runners bun run build:runners
npm run build bun run build
npm run setup -- --step service bun run setup -- --step service
``` ```
디스코드 테스트 예시: 디스코드 테스트 예시:

6
.claude/skills/add-voice-transcription/SKILL.md
View File

@@ -23,8 +23,8 @@ Groq를 쓰면 `whisper-large-v3-turbo`, OpenAI를 쓰면 `whisper-1` 경로를
## 2. 재시작 ## 2. 재시작
```bash ```bash
npm run build bun run build
npm run setup -- --step service bun run setup -- --step service
``` ```
이미 서비스가 떠 있다면 플랫폼에 맞게 재시작만 해도 됩니다. 이미 서비스가 떠 있다면 플랫폼에 맞게 재시작만 해도 됩니다.
@@ -57,4 +57,4 @@ tail -f logs/ejclaw.log | grep -iE 'transcri|audio'
**채널에서는 보이는데 에이전트가 못 읽음** **채널에서는 보이는데 에이전트가 못 읽음**
- 채널 등록과 서비스 상태를 먼저 확인합니다. - 채널 등록과 서비스 상태를 먼저 확인합니다.
- `npm run setup -- --step verify` 결과에서 `REGISTERED_GROUPS`와 `SERVICE`를 같이 봅니다. - `bun run setup -- --step verify` 결과에서 `REGISTERED_GROUPS`와 `SERVICE`를 같이 봅니다.

8
.claude/skills/customize/SKILL.md
View File

@@ -58,13 +58,13 @@ description: Customize Discord-only EJClaw behavior, routing, integrations, prom
작게 바꿨으면 최소 이 정도는 확인합니다. 작게 바꿨으면 최소 이 정도는 확인합니다.
```bash ```bash
npm run typecheck bun run typecheck
npm test bun test
``` ```
러너나 실행 경로를 건드렸으면 추가로 확인합니다. 러너나 실행 경로를 건드렸으면 추가로 확인합니다.
```bash ```bash
npm run build:runners bun run build:runners
npm run setup -- --step verify bun run setup -- --step verify
``` ```

10
.claude/skills/debug/SKILL.md
View File

@@ -11,12 +11,12 @@ description: Debug EJClaw runtime issues on the current Discord-only, host-proce
1. 타입과 테스트부터 확인 1. 타입과 테스트부터 확인
```bash ```bash
npm run typecheck bun run typecheck
npm test bun test
``` ```
2. 서비스 상태 확인 2. 서비스 상태 확인
```bash ```bash
npm run setup -- --step verify bun run setup -- --step verify
``` ```
3. 런타임 로그 확인 3. 런타임 로그 확인
```bash ```bash
@@ -26,7 +26,7 @@ description: Debug EJClaw runtime issues on the current Discord-only, host-proce
``` ```
4. 러너 빌드 확인 4. 러너 빌드 확인
```bash ```bash
npm run build:runners bun run build:runners
``` ```
## 핵심 파일 ## 핵심 파일
@@ -46,7 +46,7 @@ description: Debug EJClaw runtime issues on the current Discord-only, host-proce
```bash ```bash
grep -n '^DISCORD_BOT_TOKEN=' .env grep -n '^DISCORD_BOT_TOKEN=' .env
npm run setup -- --step verify bun run setup -- --step verify
``` ```
- `DISCORD_BOT_TOKEN`이 없으면 채널이 안 붙습니다. - `DISCORD_BOT_TOKEN`이 없으면 채널이 안 붙습니다.

20
.claude/skills/setup/SKILL.md
View File

@@ -5,7 +5,7 @@ description: Run initial EJClaw setup for the dual-service Discord architecture.
# EJClaw Setup # EJClaw Setup
설치는 `bash setup.sh`로 부트스트랩하고, 나머지는 `npm run setup -- --step <name>`으로 진행합니다. 현재 기준 채널은 디스코드만 지원합니다. 설치는 `bash setup.sh`로 부트스트랩하고, 나머지는 `bun run setup -- --step <name>`으로 진행합니다. 현재 기준 채널은 디스코드만 지원합니다.
EJClaw는 두 개의 서비스로 구성됩니다: EJClaw는 두 개의 서비스로 구성됩니다:
- **ejclaw** — Claude Code 봇 (`@claude`) - **ejclaw** — Claude Code 봇 (`@claude`)
@@ -23,7 +23,7 @@ bash setup.sh
## 2. 현재 상태 확인 ## 2. 현재 상태 확인
```bash ```bash
npm run setup -- --step environment bun run setup -- --step environment
``` ```
여기서 확인할 것: 여기서 확인할 것:
@@ -83,7 +83,7 @@ SESSION_COMMAND_ALLOWED_SENDERS=... # 세션 명령 허용 유저 ID (쉼표
## 4. 러너 빌드 ## 4. 러너 빌드
```bash ```bash
npm run setup -- --step runners bun run setup -- --step runners
``` ```
이 단계는 아래 두 러너를 빌드합니다. 이 단계는 아래 두 러너를 빌드합니다.
@@ -91,7 +91,7 @@ npm run setup -- --step runners
- `runners/agent-runner` (Claude Code) - `runners/agent-runner` (Claude Code)
- `runners/codex-runner` (Codex) - `runners/codex-runner` (Codex)
실패하면 보통 `npm run build:runners` 출력과 각 러너의 `package.json` 의존성을 같이 보면 됩니다. 실패하면 보통 `bun run build:runners` 출력과 각 러너의 `package.json` 의존성을 같이 보면 됩니다.
## 5. 디스코드 채널 등록 ## 5. 디스코드 채널 등록
@@ -102,7 +102,7 @@ npm run setup -- --step runners
Claude 봇 채널 등록: Claude 봇 채널 등록:
```bash ```bash
npm run setup -- --step register -- \ bun run setup -- --step register -- \
--jid dc:123456789012345678 \ --jid dc:123456789012345678 \
--name "My Server #general" \ --name "My Server #general" \
--folder discord_main \ --folder discord_main \
@@ -114,7 +114,7 @@ npm run setup -- --step register -- \
Codex 봇도 같은 채널을 쓴다면 별도로 등록합니다: Codex 봇도 같은 채널을 쓴다면 별도로 등록합니다:
```bash ```bash
ASSISTANT_NAME=codex npm run setup -- --step register -- \ ASSISTANT_NAME=codex bun run setup -- --step register -- \
--jid dc:123456789012345678 \ --jid dc:123456789012345678 \
--name "My Server #general" \ --name "My Server #general" \
--folder discord_main \ --folder discord_main \
@@ -126,7 +126,7 @@ ASSISTANT_NAME=codex npm run setup -- --step register -- \
보조 채널 예시: 보조 채널 예시:
```bash ```bash
npm run setup -- --step register -- \ bun run setup -- --step register -- \
--jid dc:123456789012345678 \ --jid dc:123456789012345678 \
--name "My Server #ops" \ --name "My Server #ops" \
--folder discord_ops \ --folder discord_ops \
@@ -136,7 +136,7 @@ npm run setup -- --step register -- \
## 6. 서비스 시작 ## 6. 서비스 시작
```bash ```bash
npm run setup -- --step service bun run setup -- --step service
``` ```
이 명령은: 이 명령은:
@@ -163,7 +163,7 @@ journalctl --user -u ejclaw-codex -f
## 7. 최종 검증 ## 7. 최종 검증
```bash ```bash
npm run setup -- --step verify bun run setup -- --step verify
``` ```
성공 기준: 성공 기준:
@@ -176,7 +176,7 @@ npm run setup -- --step verify
## 빠른 문제 해결 ## 빠른 문제 해결
- 빌드 문제: `npm run typecheck`, `npm test`, `npm run build:runners` - 빌드 문제: `bun run typecheck`, `bun test`, `bun run build:runners`
- Claude 서비스 문제: `logs/ejclaw.error.log` 또는 `journalctl --user -u ejclaw -f` - Claude 서비스 문제: `logs/ejclaw.error.log` 또는 `journalctl --user -u ejclaw -f`
- Codex 서비스 문제: `logs/ejclaw-codex.error.log` 또는 `journalctl --user -u ejclaw-codex -f` - Codex 서비스 문제: `logs/ejclaw-codex.error.log` 또는 `journalctl --user -u ejclaw-codex -f`
- 디스코드 연결 문제: `.env`의 `DISCORD_BOT_TOKEN`과 등록된 `dc:*` JID 확인 - 디스코드 연결 문제: `.env`의 `DISCORD_BOT_TOKEN`과 등록된 `dc:*` JID 확인

4
.claude/skills/update-skills/SKILL.md
View File

@@ -110,8 +110,8 @@ If a merge fails badly (e.g., cannot resolve conflicts):
# Step 4: Validation # Step 4: Validation
After all selected skills are merged: After all selected skills are merged:
- `npm run build` - `bun run build`
- `npm test` (do not fail the flow if tests are not configured) - `bun test` (do not fail the flow if tests are not configured)
If build fails: If build fails:
- Show the error. - Show the error.

8
CLAUDE.md
View File

@@ -38,9 +38,9 @@ Single unified service (`ejclaw`) manages three Discord bots (Claude, Codex-main
Run commands directly—don't tell the user to run them. Run commands directly—don't tell the user to run them.
```bash ```bash
npm run build # Build main project bun run build # Build main project
npm run build:runners # Install + build both runners bun run build:runners # Install + build both runners
npm run dev # Dev mode with hot reload bun run dev # Dev mode with hot reload
``` ```
Service management (Linux): Service management (Linux):
@@ -52,7 +52,7 @@ journalctl --user -u ejclaw -f # Follow logs
Deploy to server (build on server, not locally): Deploy to server (build on server, not locally):
```bash ```bash
ssh clone-ej@100.64.185.108 'cd ~/EJClaw && git pull && npm run build && npm run build:runners && systemctl --user restart ejclaw' ssh clone-ej@100.64.185.108 'cd ~/EJClaw && git pull && bun run build && bun run build:runners && systemctl --user restart ejclaw'
``` ```
## Service Stack Architecture ## Service Stack Architecture

16
README.md
View File

@@ -100,9 +100,9 @@ Reviewer (persistent Docker container):
```bash ```bash
git clone https://github.com/phj1081/EJClaw.git git clone https://github.com/phj1081/EJClaw.git
cd EJClaw cd EJClaw
npm install bun install
npm run build:runners bun run build:runners
npm run build bun run build
``` ```
### Environment ### Environment
@@ -152,16 +152,16 @@ journalctl --user -u ejclaw -f # Follow logs
Build on server, not locally: Build on server, not locally:
```bash ```bash
ssh clone-ej@100.64.185.108 'cd ~/EJClaw && git pull && npm run build && npm run build:runners && systemctl --user restart ejclaw' ssh clone-ej@100.64.185.108 'cd ~/EJClaw && git pull && bun run build && bun run build:runners && systemctl --user restart ejclaw'
``` ```
## Development ## Development
```bash ```bash
npm run build # Build main project bun run build # Build main project
npm run build:runners # Install + build both runners bun run build:runners # Install + build both runners
npm run dev # Dev mode with hot reload bun run dev # Dev mode with hot reload
npm test # Run tests bun test # Run tests
``` ```
## License ## License

2
scripts/restart-ejclaw-stack.sh
View File

@@ -5,4 +5,4 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)" PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
cd "${PROJECT_ROOT}" cd "${PROJECT_ROOT}"
npx tsx setup/restart-stack.ts "$@" bun setup/restart-stack.ts "$@"

23
scripts/run-migrations.ts
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env tsx #!/usr/bin/env bun
import { execFileSync, execSync } from 'child_process'; import { execFileSync, execSync } from 'child_process';
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
@@ -13,20 +13,16 @@ function compareSemver(a: string, b: string): number {
return 0; return 0;
} }
// Resolve tsx binary once to avoid npx race conditions across migrations // Resolve bun binary once
function resolveTsx(): string { function resolveBun(): string {
// Check local node_modules first
const local = path.resolve('node_modules/.bin/tsx');
if (fs.existsSync(local)) return local;
// Fall back to whichever tsx is in PATH
try { try {
return execSync('which tsx', { encoding: 'utf-8' }).trim(); return execSync('which bun', { encoding: 'utf-8' }).trim();
} catch { } catch {
return 'npx'; // last resort return 'bun'; // last resort
} }
} }
const tsxBin = resolveTsx(); const bunBin = resolveBun();
const fromVersion = process.argv[2]; const fromVersion = process.argv[2];
const toVersion = process.argv[3]; const toVersion = process.argv[3];
@@ -34,7 +30,7 @@ const newCorePath = process.argv[4];
if (!fromVersion || !toVersion || !newCorePath) { if (!fromVersion || !toVersion || !newCorePath) {
console.error( console.error(
'Usage: tsx scripts/run-migrations.ts <from-version> <to-version> <new-core-path>', 'Usage: bun scripts/run-migrations.ts <from-version> <to-version> <new-core-path>',
); );
process.exit(1); process.exit(1);
} }
@@ -80,10 +76,7 @@ for (const version of migrationVersions) {
} }
try { try {
const tsxArgs = tsxBin.endsWith('npx') execFileSync(bunBin, [migrationIndex, projectRoot], {
? ['tsx', migrationIndex, projectRoot]
: [migrationIndex, projectRoot];
execFileSync(tsxBin, tsxArgs, {
stdio: 'pipe', stdio: 'pipe',
cwd: projectRoot, cwd: projectRoot,
timeout: 120_000, timeout: 120_000,

78
setup.sh
View File

@@ -2,7 +2,7 @@
set -euo pipefail set -euo pipefail
# setup.sh — Bootstrap script for EJClaw # setup.sh — Bootstrap script for EJClaw
# Handles Node.js/npm setup, then hands off to the Node.js setup modules. # Handles Bun runtime setup, then hands off to the setup modules.
# This is the only bash script in the setup flow. # This is the only bash script in the setup flow.
PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -38,64 +38,43 @@ detect_platform() {
log "Platform: $PLATFORM, WSL: $IS_WSL, Root: $IS_ROOT" log "Platform: $PLATFORM, WSL: $IS_WSL, Root: $IS_ROOT"
} }
# --- Node.js check --- # --- Bun check ---
check_node() { check_bun() {
NODE_OK="false" BUN_OK="false"
NODE_VERSION="not_found" BUN_VERSION="not_found"
NODE_PATH_FOUND="" BUN_PATH_FOUND=""
if command -v node >/dev/null 2>&1; then if command -v bun >/dev/null 2>&1; then
NODE_VERSION=$(node --version 2>/dev/null | sed 's/^v//') BUN_VERSION=$(bun --version 2>/dev/null)
NODE_PATH_FOUND=$(command -v node) BUN_PATH_FOUND=$(command -v bun)
local major BUN_OK="true"
major=$(echo "$NODE_VERSION" | cut -d. -f1) log "Bun $BUN_VERSION at $BUN_PATH_FOUND (ok=$BUN_OK)"
if [ "$major" -ge 20 ] 2>/dev/null; then
NODE_OK="true"
fi
log "Node $NODE_VERSION at $NODE_PATH_FOUND (major=$major, ok=$NODE_OK)"
else else
log "Node not found" log "Bun not found"
fi fi
} }
# --- npm install --- # --- bun install ---
install_deps() { install_deps() {
DEPS_OK="false" DEPS_OK="false"
NATIVE_OK="false"
if [ "$NODE_OK" = "false" ]; then if [ "$BUN_OK" = "false" ]; then
log "Skipping npm install — Node not available" log "Skipping bun install — Bun not available"
return return
fi fi
cd "$PROJECT_ROOT" cd "$PROJECT_ROOT"
# npm install with --unsafe-perm if root (needed for native modules) log "Running bun install"
local npm_flags="" if bun install >> "$LOG_FILE" 2>&1; then
if [ "$IS_ROOT" = "true" ]; then
npm_flags="--unsafe-perm"
log "Running as root, using --unsafe-perm"
fi
log "Running npm install $npm_flags"
if npm install $npm_flags >> "$LOG_FILE" 2>&1; then
DEPS_OK="true" DEPS_OK="true"
log "npm install succeeded" log "bun install succeeded"
else else
log "npm install failed" log "bun install failed"
return return
fi fi
# Verify native module (better-sqlite3)
log "Verifying native modules"
if node -e "require('better-sqlite3')" >> "$LOG_FILE" 2>&1; then
NATIVE_OK="true"
log "better-sqlite3 loads OK"
else
log "better-sqlite3 failed to load"
fi
} }
# --- Build tools check --- # --- Build tools check ---
@@ -121,18 +100,16 @@ check_build_tools() {
log "=== Bootstrap started ===" log "=== Bootstrap started ==="
detect_platform detect_platform
check_node check_bun
install_deps install_deps
check_build_tools check_build_tools
# Emit status block # Emit status block
STATUS="success" STATUS="success"
if [ "$NODE_OK" = "false" ]; then if [ "$BUN_OK" = "false" ]; then
STATUS="node_missing" STATUS="bun_missing"
elif [ "$DEPS_OK" = "false" ]; then elif [ "$DEPS_OK" = "false" ]; then
STATUS="deps_failed" STATUS="deps_failed"
elif [ "$NATIVE_OK" = "false" ]; then
STATUS="native_failed"
fi fi
cat <<EOF cat <<EOF
@@ -140,11 +117,10 @@ cat <<EOF
PLATFORM: $PLATFORM PLATFORM: $PLATFORM
IS_WSL: $IS_WSL IS_WSL: $IS_WSL
IS_ROOT: $IS_ROOT IS_ROOT: $IS_ROOT
NODE_VERSION: $NODE_VERSION BUN_VERSION: $BUN_VERSION
NODE_OK: $NODE_OK BUN_OK: $BUN_OK
NODE_PATH: ${NODE_PATH_FOUND:-not_found} BUN_PATH: ${BUN_PATH_FOUND:-not_found}
DEPS_OK: $DEPS_OK DEPS_OK: $DEPS_OK
NATIVE_OK: $NATIVE_OK
HAS_BUILD_TOOLS: $HAS_BUILD_TOOLS HAS_BUILD_TOOLS: $HAS_BUILD_TOOLS
STATUS: $STATUS STATUS: $STATUS
LOG: logs/setup.log LOG: logs/setup.log
@@ -153,9 +129,9 @@ EOF
log "=== Bootstrap completed: $STATUS ===" log "=== Bootstrap completed: $STATUS ==="
if [ "$NODE_OK" = "false" ]; then if [ "$BUN_OK" = "false" ]; then
exit 2 exit 2
fi fi
if [ "$DEPS_OK" = "false" ] || [ "$NATIVE_OK" = "false" ]; then if [ "$DEPS_OK" = "false" ]; then
exit 1 exit 1
fi fi

4
setup/index.ts
View File

@@ -1,6 +1,6 @@
/** /**
* Setup CLI entry point. * Setup CLI entry point.
* Usage: npx tsx setup/index.ts --step <name> [args...] * Usage: bun setup/index.ts --step <name> [args...]
*/ */
import { logger } from '../src/logger.js'; import { logger } from '../src/logger.js';
import { emitStatus } from './status.js'; import { emitStatus } from './status.js';
@@ -23,7 +23,7 @@ async function main(): Promise<void> {
if (stepIdx === -1 || !args[stepIdx + 1]) { if (stepIdx === -1 || !args[stepIdx + 1]) {
console.error( console.error(
`Usage: npx tsx setup/index.ts --step <${Object.keys(STEPS).join('|')}> [args...]`, `Usage: bun setup/index.ts --step <${Object.keys(STEPS).join('|')}> [args...]`,
); );
process.exit(1); process.exit(1);
} }

2
setup/restart-stack.test.ts
View File

@@ -155,7 +155,7 @@ describe('restartStackServices', () => {
serviceManager: 'systemd', serviceManager: 'systemd',
serviceId: 'codex-main', serviceId: 'codex-main',
}), }),
).toThrow('Run `npm run setup -- --step service`'); ).toThrow('Run `bun run setup -- --step service`');
}); });
it('does not hide a general start failure behind direct fallback', () => { it('does not hide a general start failure behind direct fallback', () => {

2
setup/restart-stack.ts
View File

@@ -9,7 +9,7 @@ export const STACK_RESTART_UNIT_NAME = 'ejclaw-stack-restart.service';
const UNIT_NOT_FOUND_PATTERN = const UNIT_NOT_FOUND_PATTERN =
/(Unit .* not found|Could not find the requested service|not-found)/i; /(Unit .* not found|Could not find the requested service|not-found)/i;
const MANAGED_SERVICE_CALLER_FALLBACK_MESSAGE = const MANAGED_SERVICE_CALLER_FALLBACK_MESSAGE =
'Stack restart unit is not installed yet. Run `npm run setup -- --step service` from an external shell before retrying from a managed EJClaw service.'; 'Stack restart unit is not installed yet. Run `bun run setup -- --step service` from an external shell before retrying from a managed EJClaw service.';
interface RestartStackDeps { interface RestartStackDeps {
execFileSyncImpl?: typeof execFileSync; execFileSyncImpl?: typeof execFileSync;

2
setup/runners.ts
View File

@@ -15,7 +15,7 @@ export async function run(_args: string[]): Promise<void> {
let buildOk = false; let buildOk = false;
logger.info('Building agent runners'); logger.info('Building agent runners');
try { try {
execSync('npm run build:runners', { execSync('bun run build:runners', {
cwd: projectRoot, cwd: projectRoot,
stdio: ['ignore', 'pipe', 'pipe'], stdio: ['ignore', 'pipe', 'pipe'],
}); });

6
setup/service.test.ts
View File

@@ -149,13 +149,13 @@ describe('systemd unit generation', () => {
it('sets correct ExecStart', () => { it('sets correct ExecStart', () => {
const unit = generateSystemdUnit( const unit = generateSystemdUnit(
'/usr/bin/node', '/usr/bin/bun',
'/srv/ejclaw', '/srv/ejclaw',
'/home/user', '/home/user',
false, false,
); );
expect(unit).toContain( expect(unit).toContain(
'ExecStart=/usr/bin/node /srv/ejclaw/dist/index.js', 'ExecStart=/usr/bin/bun /srv/ejclaw/dist/index.js',
); );
}); });
}); });
@@ -207,7 +207,7 @@ describe('service definitions', () => {
it('generates a oneshot stack restart unit', () => { it('generates a oneshot stack restart unit', () => {
const unit = buildStackRestartSystemdUnit( const unit = buildStackRestartSystemdUnit(
'/srv/ejclaw', '/srv/ejclaw',
'/usr/bin/node', '/usr/bin/bun',
'/home/user', '/home/user',
); );

2
setup/service.ts
View File

@@ -38,7 +38,7 @@ export async function run(_args: string[]): Promise<void> {
// Build first // Build first
logger.info('Building TypeScript'); logger.info('Building TypeScript');
try { try {
execSync('npm run build', { execSync('bun run build', {
cwd: projectRoot, cwd: projectRoot,
stdio: ['ignore', 'pipe', 'pipe'], stdio: ['ignore', 'pipe', 'pipe'],
}); });

4
src/agent-runner.ts
View File

@@ -152,12 +152,12 @@ export async function runAgentProcess(
if (!fs.existsSync(distEntry)) { if (!fs.existsSync(distEntry)) {
logger.error( logger.error(
{ runnerDir, chatJid: input.chatJid, runId: input.runId }, { runnerDir, chatJid: input.chatJid, runId: input.runId },
'Runner not built. Run: cd runners/agent-runner && npm install && npm run build', 'Runner not built. Run: cd runners/agent-runner && bun install && bun run build',
); );
return { return {
status: 'error', status: 'error',
result: null, result: null,
error: `Runner not built at ${distEntry}. Run npm run build:runners first.`, error: `Runner not built at ${distEntry}. Run bun run build:runners first.`,
}; };
} }

4
src/db.ts
View File

@@ -2271,9 +2271,7 @@ export function claimServiceHandoff(id: number): boolean {
WHERE id = ? WHERE id = ?
AND status = 'pending'`, AND status = 'pending'`,
).run(id); ).run(id);
return ( return (db.prepare('SELECT changes() as c').get() as { c: number }).c > 0;
(db.prepare('SELECT changes() as c').get() as { c: number }).c > 0
);
} }
export function completeServiceHandoff(id: number): void { export function completeServiceHandoff(id: number): void {

2
src/restart-context-cli.ts
View File

@@ -5,7 +5,7 @@ function printUsageAndExit(): never {
console.error( console.error(
[ [
'Usage:', 'Usage:',
' tsx src/restart-context-cli.ts write --chat-jid <jid> --summary <text> [--verify <text> ...] [--service-id <id> ...]', ' bun src/restart-context-cli.ts write --chat-jid <jid> --summary <text> [--verify <text> ...] [--service-id <id> ...]',
].join('\n'), ].join('\n'),
); );
process.exit(1); process.exit(1);