idlewatch 0.1.2 → 0.1.3

package/bin/idlewatch-agent.js

@@ -391,7 +391,7 @@ if (quickstartRequested) {
 
     console.error(`⚠️ Setup is not finished yet. Mode=${result.mode} device=${result.deviceName} envFile=${result.outputEnvFile}`)
     console.error('The first required telemetry sample did not publish successfully, so this device may not be linked yet.')
-    console.error(`Retry with: idlewatch --once`)
+    console.error(`Retry with: set -a; source "${result.outputEnvFile}"; set +a && idlewatch --once`)
     console.error('Or rerun: idlewatch quickstart')
     process.exit(onceRun.status ?? 1)
   } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "idlewatch",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Host telemetry collector for IdleWatch",
   "type": "module",
   "files": [

package/scripts/validate-onboarding.mjs

@@ -2,7 +2,7 @@ import fs from 'node:fs'
 import http from 'node:http'
 import os from 'node:os'
 import path from 'node:path'
-import { spawnSync } from 'node:child_process'
+import { spawn } from 'node:child_process'
 
 const repoRoot = path.resolve(path.dirname(new URL(import.meta.url).pathname), '..')
 const binPath = path.join(repoRoot, 'bin', 'idlewatch-agent.js')
@@ -34,30 +34,47 @@ await new Promise((resolve, reject) => {
 const address = server.address()
 const cloudIngestUrl = `http://127.0.0.1:${address.port}/api/ingest`
 
+function runQuickstart(env) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(process.execPath, [binPath, 'quickstart'], {
+      env,
+      stdio: ['ignore', 'pipe', 'pipe']
+    })
+
+    let stdout = ''
+    let stderr = ''
+    child.stdout.on('data', (chunk) => {
+      stdout += chunk
+    })
+    child.stderr.on('data', (chunk) => {
+      stderr += chunk
+    })
+    child.on('error', reject)
+    child.on('close', (code) => resolve({ code, stdout, stderr }))
+  })
+}
+
 try {
   const envOut = path.join(tmpRoot, 'generated.env')
   const configDir = path.join(tmpRoot, 'config')
   const localLogPath = path.join(configDir, 'logs', 'validator-box-metrics.ndjson')
   const lastGoodCachePath = path.join(configDir, 'cache', 'validator-box-openclaw-last-good.json')
 
-  const run = spawnSync(process.execPath, [binPath, 'quickstart'], {
-    env: {
-      ...process.env,
-      IDLEWATCH_ENROLL_NON_INTERACTIVE: '1',
-      IDLEWATCH_ENROLL_MODE: 'production',
-      IDLEWATCH_CLOUD_API_KEY: 'iwk_abcdefghijklmnopqrstuvwxyz123456',
-      IDLEWATCH_CLOUD_INGEST_URL: cloudIngestUrl,
-      IDLEWATCH_ENROLL_OUTPUT_ENV_FILE: envOut,
-      IDLEWATCH_ENROLL_CONFIG_DIR: configDir,
-      IDLEWATCH_DEVICE_NAME: 'Validator Box',
-      IDLEWATCH_DEVICE_ID: 'validator-box',
-      IDLEWATCH_MONITOR_TARGETS: 'cpu,memory',
-      IDLEWATCH_OPENCLAW_USAGE: 'off'
-    },
-    encoding: 'utf8'
+  const run = await runQuickstart({
+    ...process.env,
+    IDLEWATCH_ENROLL_NON_INTERACTIVE: '1',
+    IDLEWATCH_ENROLL_MODE: 'production',
+    IDLEWATCH_CLOUD_API_KEY: 'iwk_abcdefghijklmnopqrstuvwxyz123456',
+    IDLEWATCH_CLOUD_INGEST_URL: cloudIngestUrl,
+    IDLEWATCH_ENROLL_OUTPUT_ENV_FILE: envOut,
+    IDLEWATCH_ENROLL_CONFIG_DIR: configDir,
+    IDLEWATCH_DEVICE_NAME: 'Validator Box',
+    IDLEWATCH_DEVICE_ID: 'validator-box',
+    IDLEWATCH_MONITOR_TARGETS: 'cpu,memory',
+    IDLEWATCH_OPENCLAW_USAGE: 'off'
   })
 
-  if (run.status !== 0) {
+  if (run.code !== 0) {
     throw new Error(`quickstart failed\nstdout:\n${run.stdout}\nstderr:\n${run.stderr}`)
   }
 
@@ -82,6 +99,10 @@ try {
     }
   }
 
+  if (!run.stdout.includes('✅ Setup complete.')) {
+    throw new Error('quickstart success output did not include setup completion summary')
+  }
+
   if (requests.length === 0) {
     throw new Error('quickstart did not send the initial telemetry sample')
   }
@@ -93,6 +114,6 @@ try {
 
   console.log('onboarding validation passed')
 } finally {
-  server.close()
+  await new Promise((resolve) => server.close(resolve))
   fs.rmSync(tmpRoot, { recursive: true, force: true })
 }

package/src/config.js

@@ -21,6 +21,22 @@ const isNonNegFinite = (v) => Number.isFinite(v) && v >= 0
 const isNonNegInt = (v) => Number.isInteger(v) && v >= 0
 const isBool01 = (v) => v === 0 || v === 1
 
+function expandSupportedPathVars(value) {
+  if (typeof value !== 'string' || !value) return value
+
+  const home = process.env.HOME || os.homedir()
+  const tmpdir = process.env.TMPDIR || os.tmpdir()
+
+  return value
+    .replace(/^~(?=$|\/)/, home)
+    .replace(/\$\{HOME\}|\$HOME/g, home)
+    .replace(/\$\{TMPDIR\}|\$TMPDIR/g, tmpdir)
+}
+
+function resolveEnvPath(value) {
+  return path.resolve(expandSupportedPathVars(value))
+}
+
 /**
  * Build the full IdleWatch configuration from environment variables.
  * Throws on invalid values.
@@ -63,11 +79,11 @@ export function buildConfig() {
   const BASE_DIR = path.join(os.homedir(), '.idlewatch')
 
   const LOCAL_LOG_PATH = process.env.IDLEWATCH_LOCAL_LOG_PATH
-    ? path.resolve(process.env.IDLEWATCH_LOCAL_LOG_PATH)
+    ? resolveEnvPath(process.env.IDLEWATCH_LOCAL_LOG_PATH)
     : path.join(BASE_DIR, 'logs', `${SAFE_HOST}-metrics.ndjson`)
 
   const OPENCLAW_LAST_GOOD_CACHE_PATH = process.env.IDLEWATCH_OPENCLAW_LAST_GOOD_CACHE_PATH
-    ? path.resolve(process.env.IDLEWATCH_OPENCLAW_LAST_GOOD_CACHE_PATH)
+    ? resolveEnvPath(process.env.IDLEWATCH_OPENCLAW_LAST_GOOD_CACHE_PATH)
     : path.join(BASE_DIR, 'cache', `${SAFE_HOST}-openclaw-last-good.json`)
 
   return Object.freeze({

package/src/enrollment.js

@@ -3,6 +3,7 @@ import os from 'node:os'
 import path from 'node:path'
 import readline from 'node:readline/promises'
 import process from 'node:process'
+import { fileURLToPath } from 'node:url'
 import { spawnSync } from 'node:child_process'
 
 function defaultConfigDir() {
@@ -24,6 +25,8 @@ function writeSecureFile(filePath, content) {
 }
 
 const MONITOR_TARGET_CHOICES = ['cpu', 'memory', 'gpu', 'openclaw']
+const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url))
+const PACKAGE_ROOT = path.resolve(MODULE_DIR, '..')
 
 function commandExists(bin, args = ['--version']) {
   const result = spawnSync(bin, args, { stdio: 'ignore' })
@@ -93,13 +96,13 @@ function sanitizeDeviceId(raw, fallback = os.hostname()) {
 
 function tryRustTui({ configDir, outputEnvFile }) {
   const disabled = process.env.IDLEWATCH_DISABLE_RUST_TUI === '1'
-  if (disabled) return false
+  if (disabled) return { ok: false, reason: 'disabled' }
 
   const cargoProbe = spawnSync('cargo', ['--version'], { stdio: 'ignore' })
-  if (cargoProbe.status !== 0) return false
+  if (cargoProbe.status !== 0) return { ok: false, reason: 'cargo-missing' }
 
-  const manifestPath = path.resolve(process.cwd(), 'tui', 'Cargo.toml')
-  if (!fs.existsSync(manifestPath)) return false
+  const manifestPath = path.join(PACKAGE_ROOT, 'tui', 'Cargo.toml')
+  if (!fs.existsSync(manifestPath)) return { ok: false, reason: 'manifest-missing', manifestPath }
 
   const run = spawnSync('cargo', ['run', '--quiet', '--manifest-path', manifestPath], {
     stdio: 'inherit',
@@ -111,10 +114,10 @@ function tryRustTui({ configDir, outputEnvFile }) {
   })
 
   if (run.status === 0) {
-    return true
+    return { ok: true, manifestPath }
   }
 
-  return false
+  return { ok: false, reason: `cargo-run-failed:${run.status ?? 'unknown'}`, manifestPath }
 }
 
 function promptModeText() {
@@ -137,11 +140,18 @@ export async function runEnrollmentWizard(options = {}) {
     availableMonitorTargets
   )
 
-  if (!nonInteractive && tryRustTui({ configDir, outputEnvFile })) {
-    return {
-      mode: 'tui',
-      configDir,
-      outputEnvFile
+  if (!nonInteractive) {
+    const tuiResult = tryRustTui({ configDir, outputEnvFile })
+    if (tuiResult.ok) {
+      return {
+        mode: 'tui',
+        configDir,
+        outputEnvFile
+      }
+    }
+
+    if (!['disabled', 'cargo-missing'].includes(tuiResult.reason || '')) {
+      console.warn(`IdleWatch TUI unavailable (${tuiResult.reason || 'unknown'}). Falling back to text setup.`)
     }
   }