refactor: merge packages/tinyagi into packages/cli, move tinyagi.sh to lib/ (#238)

jlia0 · claude · web-flow · commit e788405bb48c · 2026-03-19T00:51:31.000+08:00
- Move tinyagi.mjs and defaults.mjs from packages/tinyagi to packages/cli
- Move tinyagi.sh from project root to lib/tinyagi.sh
- Update bin/tinyagi and bin/tinyclaw to point to packages/cli
- Update all path references in channels, server, cli, bundle, and release scripts
- Fix install.sh to copy files to ~/.tinyagi permanently
- Delete packages/tinyagi (merged into packages/cli)

Co-authored-by: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -81,8 +81,6 @@ jobs:
           cp -r .agents/ "$BUNDLE_DIR/"
           cp -r tinyoffice/ "$BUNDLE_DIR/"
 
-          cp tinyagi.sh "$BUNDLE_DIR/"
-
           # Copy root files
           cp package.json "$BUNDLE_DIR/"
           cp package-lock.json "$BUNDLE_DIR/"
@@ -97,9 +95,9 @@ jobs:
           # Make scripts executable
           chmod +x "$BUNDLE_DIR/bin/tinyagi"
           chmod +x "$BUNDLE_DIR/bin/tinyclaw"
-          chmod +x "$BUNDLE_DIR/tinyagi.sh"
           chmod +x "$BUNDLE_DIR/scripts/install.sh"
           chmod +x "$BUNDLE_DIR/scripts/bundle.sh"
+          chmod +x "$BUNDLE_DIR/lib/tinyagi.sh"
           chmod +x "$BUNDLE_DIR/lib/heartbeat-cron.sh"
           chmod +x "$BUNDLE_DIR/lib/update.sh"
 
diff --git a/bin/tinyagi b/bin/tinyagi
@@ -23,4 +23,4 @@ REPO_ROOT="$(dirname "$TINYAGI_DIR")"
 export TINYAGI_HOME="$HOME/.tinyagi"
 
 # Execute tinyagi.mjs with all arguments
-exec node "$REPO_ROOT/packages/tinyagi/bin/tinyagi.mjs" "$@"
+exec node "$REPO_ROOT/packages/cli/bin/tinyagi.mjs" "$@"
diff --git a/bin/tinyclaw b/bin/tinyclaw
@@ -23,4 +23,4 @@ REPO_ROOT="$(dirname "$TINYCLAW_DIR")"
 export TINYCLAW_HOME="$HOME/.tinyclaw"
 
 # Delegate to tinyagi entrypoint
-exec node "$REPO_ROOT/packages/tinyagi/bin/tinyagi.mjs" "$@"
+exec node "$REPO_ROOT/packages/cli/bin/tinyagi.mjs" "$@"
diff --git a/lib/daemon.sh b/lib/daemon.sh
@@ -472,7 +472,7 @@ restart_daemon() {
             local bash_bin
             bash_bin=$(command -v bash)
             log "Restart requested from inside tmux session; scheduling detached restart..."
-            nohup "$bash_bin" "$SCRIPT_DIR/tinyagi.sh" __delayed_start >/dev/null 2>&1 &
+            nohup "$bash_bin" "$SCRIPT_DIR/lib/tinyagi.sh" __delayed_start >/dev/null 2>&1 &
             stop_daemon
             return
         fi
diff --git a/lib/tinyagi.sh b/lib/tinyagi.sh
@@ -9,7 +9,7 @@
 #   4. Run setup wizard to enable it
 
 # SCRIPT_DIR = repo root (where bash scripts live)
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 
 # TINYAGI_HOME = data directory (settings, queue, logs, etc.)
 # Always defaults to ~/.tinyagi; override via TINYAGI_HOME env var.
diff --git a/packages/channels/src/discord.ts b/packages/channels/src/discord.ts
@@ -324,7 +324,7 @@ client.on(Events.MessageCreate, async (message: Message) => {
             log('INFO', 'Restart command received');
             await message.reply('Restarting TinyAGI...');
             const { exec } = require('child_process');
-            exec(`"${path.join(SCRIPT_DIR, 'tinyagi.sh')}" restart`, { detached: true, stdio: 'ignore' });
+            exec(`"${path.join(SCRIPT_DIR, 'lib', 'tinyagi.sh')}" restart`, { detached: true, stdio: 'ignore' });
             return;
         }
 
diff --git a/packages/channels/src/telegram.ts b/packages/channels/src/telegram.ts
@@ -443,7 +443,7 @@ bot.on('message', async (msg: TelegramBot.Message) => {
                 reply_to_message_id: msg.message_id,
             });
             const { exec } = require('child_process');
-            exec(`"${path.join(SCRIPT_DIR, 'tinyagi.sh')}" restart`, { detached: true, stdio: 'ignore' });
+            exec(`"${path.join(SCRIPT_DIR, 'lib', 'tinyagi.sh')}" restart`, { detached: true, stdio: 'ignore' });
             return;
         }
 
diff --git a/packages/channels/src/whatsapp.ts b/packages/channels/src/whatsapp.ts
@@ -324,7 +324,7 @@ client.on('message_create', async (message: Message) => {
             log('INFO', 'Restart command received');
             await message.reply('Restarting TinyAGI...');
             const { exec } = require('child_process');
-            exec(`"${path.join(SCRIPT_DIR, 'tinyagi.sh')}" restart`, { detached: true, stdio: 'ignore' });
+            exec(`"${path.join(SCRIPT_DIR, 'lib', 'tinyagi.sh')}" restart`, { detached: true, stdio: 'ignore' });
             return;
         }
 
diff --git a/packages/cli/bin/tinyagi.mjs b/packages/cli/bin/tinyagi.mjs
@@ -56,7 +56,7 @@ function checkPrerequisites() {
 // ── Installation ─────────────────────────────────────────────────────────────
 
 function isInstalled() {
-    return fs.existsSync(path.join(INSTALL_DIR, 'tinyagi.sh'));
+    return fs.existsSync(path.join(INSTALL_DIR, 'lib/tinyagi.sh'));
 }
 
 async function install() {
@@ -115,7 +115,7 @@ async function install() {
     }
 
     // Make scripts executable
-    exec(`chmod +x "${INSTALL_DIR}/bin/tinyagi" "${INSTALL_DIR}/bin/tinyclaw" "${INSTALL_DIR}/tinyagi.sh" "${INSTALL_DIR}/lib/heartbeat-cron.sh" "${INSTALL_DIR}/packages/tinyagi/bin/tinyagi.mjs"`);
+    exec(`chmod +x "${INSTALL_DIR}/bin/tinyagi" "${INSTALL_DIR}/bin/tinyclaw" "${INSTALL_DIR}/lib/tinyagi.sh" "${INSTALL_DIR}/lib/heartbeat-cron.sh" "${INSTALL_DIR}/packages/cli/bin/tinyagi.mjs"`);
 
     // Install CLI symlink (tinyagi command)
     installCli();
@@ -128,7 +128,7 @@ async function install() {
 
 function installCli() {
     // Determine installation directory for the symlink
-    const tinyagiSrc = path.join(INSTALL_DIR, 'packages/tinyagi/bin/tinyagi.mjs');
+    const tinyagiSrc = path.join(INSTALL_DIR, 'packages/cli/bin/tinyagi.mjs');
     let installDir = '';
 
     try {
@@ -250,9 +250,9 @@ async function run() {
 // ── Delegate to bash (tinyagi.sh) ───────────────────────────────────────────
 
 function delegateToBash(args, opts = {}) {
-    const tinyagiSh = path.join(INSTALL_DIR, 'tinyagi.sh');
+    const tinyagiSh = path.join(INSTALL_DIR, 'lib/tinyagi.sh');
     if (!fs.existsSync(tinyagiSh)) {
-        log(RED, 'TinyAGI is not installed. Run "tinyagi" or "npx tinyagi" first.');
+        log(RED, 'TinyAGI is not installed. Run "tinyagi" first.');
         process.exit(1);
     }
 
diff --git a/packages/cli/lib/defaults.mjs b/packages/cli/lib/defaults.mjs
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -3,12 +3,16 @@
   "version": "0.0.10",
   "type": "module",
   "main": "dist/shared.js",
+  "bin": {
+    "tinyagi": "./bin/tinyagi.mjs"
+  },
   "scripts": {
     "build": "tsc",
     "dev": "tsc -w"
   },
   "dependencies": {
     "@clack/prompts": "^1.1.0",
-    "@tinyagi/core": "*"
+    "@tinyagi/core": "*",
+    "open": "^10.0.0"
   }
 }
diff --git a/packages/cli/src/update.ts b/packages/cli/src/update.ts
@@ -67,7 +67,7 @@ async function doUpdate() {
             p.log.message('Update cancelled.');
             return;
         }
-        execSync(`"${path.join(SCRIPT_DIR, 'tinyagi.sh')}" stop`, { stdio: 'inherit' });
+        execSync(`"${path.join(SCRIPT_DIR, 'lib', 'tinyagi.sh')}" stop`, { stdio: 'inherit' });
     }
 
     const currentVersion = getCurrentVersion();
@@ -124,7 +124,7 @@ async function doUpdate() {
         `v${currentVersion}-${new Date().toISOString().replace(/[:.]/g, '').slice(0, 15)}`,
     );
     fs.mkdirSync(backupDir, { recursive: true });
-    for (const item of ['bin', 'src', 'dist', 'lib', 'tinyagi.sh', 'package.json']) {
+    for (const item of ['bin', 'src', 'dist', 'lib', 'package.json']) {
         const src = path.join(SCRIPT_DIR, item);
         if (fs.existsSync(src)) {
             execSync(`cp -r "${src}" "${backupDir}/"`, { stdio: 'ignore' });
@@ -136,7 +136,7 @@ async function doUpdate() {
     spinner.start('[3/4] Installing...');
     execSync(`cd "${tempDir}" && tar -xzf tinyagi-bundle.tar.gz && cp -a tinyagi/. "${SCRIPT_DIR}/"`, { stdio: 'ignore' });
     execSync(`find "${SCRIPT_DIR}/bin" "${SCRIPT_DIR}/lib" "${SCRIPT_DIR}/scripts" -type f \\( -name "*.sh" -o -name "tinyagi" \\) -exec chmod +x {} +`, { stdio: 'ignore' });
-    execSync(`chmod +x "${SCRIPT_DIR}/tinyagi.sh"`, { stdio: 'ignore' });
+    execSync(`chmod +x "${SCRIPT_DIR}/lib/tinyagi.sh"`, { stdio: 'ignore' });
     fs.rmSync(tempDir, { recursive: true, force: true });
 
     // Rebuild native modules
diff --git a/packages/server/src/routes/services.ts b/packages/server/src/routes/services.ts
@@ -8,7 +8,7 @@ import { log } from '@tinyagi/core';
 const app = new Hono();
 const execFileAsync = promisify(execFile);
 
-const TINYAGI_SH = path.join(SCRIPT_DIR, 'tinyagi.sh');
+const TINYAGI_SH = path.join(SCRIPT_DIR, 'lib', 'tinyagi.sh');
 
 async function runTinyagi(...args: string[]): Promise<string> {
     const { stdout, stderr } = await execFileAsync('bash', [TINYAGI_SH, ...args], {
diff --git a/packages/tinyagi/package.json b/packages/tinyagi/package.json
diff --git a/scripts/bundle.sh b/scripts/bundle.sh
@@ -81,7 +81,6 @@ cp -r docs "$BUNDLE_DIR/" 2>/dev/null || true
 cp -r .agents "$BUNDLE_DIR/" 2>/dev/null || true
 cp -r tinyoffice/ "$BUNDLE_DIR/"
 
-cp tinyagi.sh "$BUNDLE_DIR/"
 cp package.json "$BUNDLE_DIR/"
 cp package-lock.json "$BUNDLE_DIR/"
 cp tsconfig.json "$BUNDLE_DIR/"
@@ -98,9 +97,9 @@ cp .gitignore "$BUNDLE_DIR/"
 # Make scripts executable
 chmod +x "$BUNDLE_DIR/bin/tinyagi"
 chmod +x "$BUNDLE_DIR/bin/tinyclaw"
-chmod +x "$BUNDLE_DIR/tinyagi.sh"
 chmod +x "$BUNDLE_DIR/scripts/install.sh"
 chmod +x "$BUNDLE_DIR/scripts/bundle.sh"
+chmod +x "$BUNDLE_DIR/lib/tinyagi.sh"
 chmod +x "$BUNDLE_DIR/lib/heartbeat-cron.sh"
 chmod +x "$BUNDLE_DIR/lib/update.sh"
 
diff --git a/scripts/install.sh b/scripts/install.sh
@@ -1,12 +1,20 @@
 #!/usr/bin/env bash
 # TinyAGI CLI Installation Script
-# Creates a 'tinyagi' symlink so the command is available globally.
+# Installs TinyAGI to ~/.tinyagi and creates global symlinks.
 #
 # Supports: curl -fsSL <url>/install.sh | bash
 # When piped, downloads the release tarball, extracts it, and installs.
 
 set -e
 
+INSTALL_HOME="$HOME/.tinyagi"
+
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+RED='\033[0;31m'
+BLUE='\033[0;34m'
+NC='\033[0m'
+
 # If piped (no BASH_SOURCE path), download and extract first
 if [ -z "${BASH_SOURCE[0]}" ] || [ "${BASH_SOURCE[0]}" = "bash" ]; then
     INSTALL_TMPDIR="$(mktemp -d)"
@@ -18,37 +26,48 @@ fi
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
-WRAPPER="$PROJECT_ROOT/bin/tinyagi"
-
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-RED='\033[0;31m'
-BLUE='\033[0;34m'
-NC='\033[0m'
 
 echo -e "${BLUE}TinyAGI CLI Installer${NC}"
 echo "====================="
 echo ""
 
+# Copy project files to ~/.tinyagi (permanent location)
+if [ "$PROJECT_ROOT" != "$INSTALL_HOME" ]; then
+    echo -e "Installing to: ${GREEN}~/.tinyagi${NC}"
+    mkdir -p "$INSTALL_HOME"
+    # Copy everything from the extracted/source bundle
+    cp -a "$PROJECT_ROOT/." "$INSTALL_HOME/"
+    PROJECT_ROOT="$INSTALL_HOME"
+    echo -e "  ${GREEN}✓${NC} Files installed to ~/.tinyagi"
+else
+    echo -e "Updating in: ${GREEN}~/.tinyagi${NC}"
+fi
+
+WRAPPER="$PROJECT_ROOT/bin/tinyagi"
+
 # Check if wrapper exists
 if [ ! -f "$WRAPPER" ]; then
     echo -e "${RED}Error: Wrapper script not found at $WRAPPER${NC}"
     exit 1
 fi
 
-# Determine installation directory
+chmod +x "$WRAPPER"
+chmod +x "$PROJECT_ROOT/bin/tinyclaw" 2>/dev/null || true
+chmod +x "$PROJECT_ROOT/lib/tinyagi.sh" 2>/dev/null || true
+
+# Determine symlink directory
 INSTALL_DIR=""
 
 if [ -w "/usr/local/bin" ]; then
     INSTALL_DIR="/usr/local/bin"
-    echo -e "Installing to: ${GREEN}/usr/local/bin${NC} (system-wide)"
+    echo -e "Symlinks in: ${GREEN}/usr/local/bin${NC} (system-wide)"
 elif [ -d "$HOME/.local/bin" ]; then
     INSTALL_DIR="$HOME/.local/bin"
-    echo -e "Installing to: ${GREEN}~/.local/bin${NC} (user)"
+    echo -e "Symlinks in: ${GREEN}~/.local/bin${NC} (user)"
 else
     mkdir -p "$HOME/.local/bin"
     INSTALL_DIR="$HOME/.local/bin"
-    echo -e "Installing to: ${GREEN}~/.local/bin${NC} (user, created)"
+    echo -e "Symlinks in: ${GREEN}~/.local/bin${NC} (user, created)"
 fi
 
 # Install a symlink (removes existing if present)
@@ -118,5 +137,5 @@ else
 fi
 
 echo ""
-echo "To uninstall: rm $INSTALL_DIR/tinyagi $INSTALL_DIR/tinyclaw"
+echo "To uninstall: rm -rf ~/.tinyagi && rm $INSTALL_DIR/tinyagi $INSTALL_DIR/tinyclaw"
 echo ""

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ client.on(Events.MessageCreate, async (message: Message) => {`
`324`	`324`	`log('INFO', 'Restart command received');`
`325`	`325`	`await message.reply('Restarting TinyAGI...');`
`326`	`326`	`const { exec } = require('child_process');`
`327`		- exec(`"${path.join(SCRIPT_DIR, 'tinyagi.sh')}" restart`, { detached: true, stdio: 'ignore' });
	`327`	+ exec(`"${path.join(SCRIPT_DIR, 'lib', 'tinyagi.sh')}" restart`, { detached: true, stdio: 'ignore' });
`328`	`328`	`return;`
`329`	`329`	`}`
`330`	`330`
Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ bot.on('message', async (msg: TelegramBot.Message) => {`
`443`	`443`	`reply_to_message_id: msg.message_id,`
`444`	`444`	`});`
`445`	`445`	`const { exec } = require('child_process');`
`446`		- exec(`"${path.join(SCRIPT_DIR, 'tinyagi.sh')}" restart`, { detached: true, stdio: 'ignore' });
	`446`	+ exec(`"${path.join(SCRIPT_DIR, 'lib', 'tinyagi.sh')}" restart`, { detached: true, stdio: 'ignore' });
`447`	`447`	`return;`
`448`	`448`	`}`
`449`	`449`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ client.on('message_create', async (message: Message) => {`
`324`	`324`	`log('INFO', 'Restart command received');`
`325`	`325`	`await message.reply('Restarting TinyAGI...');`
`326`	`326`	`const { exec } = require('child_process');`
`327`		- exec(`"${path.join(SCRIPT_DIR, 'tinyagi.sh')}" restart`, { detached: true, stdio: 'ignore' });
	`327`	+ exec(`"${path.join(SCRIPT_DIR, 'lib', 'tinyagi.sh')}" restart`, { detached: true, stdio: 'ignore' });
`328`	`328`	`return;`
`329`	`329`	`}`
`330`	`330`