agentclick 0.2.0 → 0.2.1

package/bin/agentclick.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { existsSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { spawnSync } from 'node:child_process'
@@ -10,8 +10,18 @@ const __filename = fileURLToPath(import.meta.url)
 const rootDir = dirname(dirname(__filename))
 const webDistIndex = join(rootDir, 'packages', 'web', 'dist', 'index.html')
 const serverDistEntry = join(rootDir, 'packages', 'server', 'dist', 'index.js')
+const packageJsonPath = join(rootDir, 'package.json')
 const args = process.argv.slice(2)
 
+function readVersion() {
+  try {
+    const pkg = JSON.parse(readFileSync(packageJsonPath, 'utf-8'))
+    return typeof pkg.version === 'string' ? pkg.version : 'unknown'
+  } catch {
+    return 'unknown'
+  }
+}
+
 function printHelp() {
   console.log(`AgentClick CLI
 
@@ -20,7 +30,16 @@ Usage:
   agentclick --help
 
 Options:
+  --version, -v   Show version number
   --help, -h   Show this help message
+
+Examples:
+  agentclick              Start the server (auto-detects port)
+  PORT=4000 agentclick    Start on a specific port
+
+Environment:
+  PORT                    Server port (default: 3001, auto-increments if busy)
+  OPENCLAW_WEBHOOK        Webhook URL for agent callbacks
 `)
 }
 
@@ -31,6 +50,10 @@ function parseArgs(argv) {
       printHelp()
       process.exit(0)
     }
+    if (arg === '--version' || arg === '-v') {
+      console.log(readVersion())
+      process.exit(0)
+    }
     console.error(`[agentclick] Unknown argument: ${arg}`)
     console.error('[agentclick] Run "agentclick --help" for usage.')
     process.exit(1)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentclick",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Human-in-the-loop approval UI for AI agents. Review, edit, and approve agent actions in your browser before they execute.",
   "keywords": [
     "ai-agent",

package/packages/server/dist/index.js

@@ -6,7 +6,7 @@ import { existsSync } from 'fs';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { learnFromDeletions } from './preference.js';
-import { createSession, getSession, listSessions, completeSession } from './store.js';
+import { createSession, getSession, listSessions, completeSession, setSessionRewriting, updateSessionPayload } from './store.js';
 const app = express();
 const PORT = Number(process.env.PORT || 3001);
 const OPENCLAW_WEBHOOK = process.env.OPENCLAW_WEBHOOK || 'http://localhost:18789/hooks/agent';
@@ -23,18 +23,23 @@ app.post('/api/review', async (req, res) => {
     if (!sessionKey) {
         console.warn('[agentclick] Warning: sessionKey missing — callback will be skipped');
     }
-    const id = `session_${Date.now()}`;
+    const now = Date.now();
+    const id = `session_${now}`;
     createSession({
         id,
         type: type || 'email_review',
         payload,
         sessionKey,
         status: 'pending',
-        createdAt: Date.now(),
+        createdAt: now,
+        updatedAt: now,
+        revision: 0,
     });
     const routeMap = {
         action_approval: 'approval',
         code_review: 'code-review',
+        form_review: 'form-review',
+        selection_review: 'selection',
     };
     const path = routeMap[type] ?? 'review';
     const url = `${WEB_ORIGIN}/${path}/${id}`;
@@ -112,17 +117,39 @@ app.get('/api/sessions/:id/wait', async (req, res) => {
         const session = getSession(req.params.id);
         if (!session)
             return res.status(404).json({ error: 'Session not found' });
-        if (session.status === 'completed')
+        if (session.status === 'completed' || session.status === 'rewriting') {
+            console.log(`[agentclick] /wait returning ${session.status} for ${session.id} (revision=${session.revision})`);
             return res.json(session);
+        }
         await new Promise(r => setTimeout(r, POLL_MS));
     }
     res.status(408).json({ error: 'timeout', message: 'User did not complete review within 5 minutes' });
 });
+// Agent updates session payload after rewriting
+app.put('/api/sessions/:id/payload', (req, res) => {
+    const session = getSession(req.params.id);
+    if (!session)
+        return res.status(404).json({ error: 'Session not found' });
+    if (session.status !== 'rewriting')
+        return res.status(400).json({ error: 'Session is not in rewriting state' });
+    console.log(`[agentclick] Payload update requested for ${session.id} (status=${session.status}, revision=${session.revision})`);
+    updateSessionPayload(req.params.id, req.body.payload);
+    const updated = getSession(req.params.id);
+    console.log(`[agentclick] Session ${session.id} payload updated, back to pending (revision=${updated?.revision ?? 'unknown'})`);
+    res.json({ ok: true });
+});
 // Web UI submits user actions
 app.post('/api/sessions/:id/complete', async (req, res) => {
     const session = getSession(req.params.id);
     if (!session)
         return res.status(404).json({ error: 'Session not found' });
+    // If user requested regeneration, set to rewriting (not completed) so agent can update
+    if (req.body.regenerate) {
+        setSessionRewriting(req.params.id, req.body);
+        console.log(`[agentclick] Session ${session.id} → rewriting:`, JSON.stringify(req.body, null, 2));
+        res.json({ ok: true, rewriting: true });
+        return;
+    }
     completeSession(req.params.id, req.body);
     console.log(`[agentclick] Session ${session.id} completed:`, JSON.stringify(req.body, null, 2));
     // Learn from delete actions and persist rules to MEMORY.md

package/packages/server/dist/store.js

@@ -15,16 +15,29 @@ db.exec(`
     status TEXT NOT NULL DEFAULT 'pending',
     result TEXT,
     sessionKey TEXT,
-    createdAt INTEGER NOT NULL
+    createdAt INTEGER NOT NULL,
+    updatedAt INTEGER NOT NULL DEFAULT 0,
+    revision INTEGER NOT NULL DEFAULT 0
   )
 `);
+// Migrate existing tables: add updatedAt and revision if missing
+try {
+    db.exec(`ALTER TABLE sessions ADD COLUMN updatedAt INTEGER NOT NULL DEFAULT 0`);
+}
+catch { /* column already exists */ }
+try {
+    db.exec(`ALTER TABLE sessions ADD COLUMN revision INTEGER NOT NULL DEFAULT 0`);
+}
+catch { /* column already exists */ }
 export function createSession(session) {
     db.prepare(`
-    INSERT INTO sessions (id, type, payload, status, sessionKey, createdAt)
-    VALUES (@id, @type, @payload, @status, @sessionKey, @createdAt)
+    INSERT INTO sessions (id, type, payload, status, sessionKey, createdAt, updatedAt, revision)
+    VALUES (@id, @type, @payload, @status, @sessionKey, @createdAt, @updatedAt, @revision)
   `).run({
         ...session,
         payload: JSON.stringify(session.payload),
+        updatedAt: session.updatedAt || Date.now(),
+        revision: session.revision || 0,
     });
 }
 export function getSession(id) {
@@ -39,8 +52,18 @@ export function listSessions(limit = 20) {
 }
 export function completeSession(id, result) {
     db.prepare(`
-    UPDATE sessions SET status = 'completed', result = ? WHERE id = ?
-  `).run(JSON.stringify(result), id);
+    UPDATE sessions SET status = 'completed', result = ?, updatedAt = ? WHERE id = ?
+  `).run(JSON.stringify(result), Date.now(), id);
+}
+export function setSessionRewriting(id, result) {
+    db.prepare(`
+    UPDATE sessions SET status = 'rewriting', result = ?, updatedAt = ? WHERE id = ?
+  `).run(JSON.stringify(result), Date.now(), id);
+}
+export function updateSessionPayload(id, payload) {
+    db.prepare(`
+    UPDATE sessions SET payload = ?, status = 'pending', result = NULL, updatedAt = ?, revision = revision + 1 WHERE id = ?
+  `).run(JSON.stringify(payload), Date.now(), id);
 }
 function deserialize(row) {
     return {
@@ -51,5 +74,7 @@ function deserialize(row) {
         result: row.result ? JSON.parse(row.result) : undefined,
         sessionKey: row.sessionKey,
         createdAt: row.createdAt,
+        updatedAt: row.updatedAt || 0,
+        revision: row.revision || 0,
     };
 }

package/packages/server/src/index.ts

@@ -6,7 +6,7 @@ import { existsSync } from 'fs'
 import { dirname, join } from 'path'
 import { fileURLToPath } from 'url'
 import { learnFromDeletions } from './preference.js'
-import { createSession, getSession, listSessions, completeSession } from './store.js'
+import { createSession, getSession, listSessions, completeSession, setSessionRewriting, updateSessionPayload } from './store.js'
 
 const app = express()
 const PORT = Number(process.env.PORT || 3001)
@@ -28,19 +28,24 @@ app.post('/api/review', async (req, res) => {
     console.warn('[agentclick] Warning: sessionKey missing — callback will be skipped')
   }
 
-  const id = `session_${Date.now()}`
+  const now = Date.now()
+  const id = `session_${now}`
   createSession({
     id,
     type: type || 'email_review',
     payload,
     sessionKey,
     status: 'pending',
-    createdAt: Date.now(),
+    createdAt: now,
+    updatedAt: now,
+    revision: 0,
   })
 
   const routeMap: Record<string, string> = {
     action_approval: 'approval',
     code_review: 'code-review',
+    form_review: 'form-review',
+    selection_review: 'selection',
   }
   const path = routeMap[type] ?? 'review'
   const url = `${WEB_ORIGIN}/${path}/${id}`
@@ -126,18 +131,42 @@ app.get('/api/sessions/:id/wait', async (req, res) => {
   while (Date.now() - start < TIMEOUT_MS) {
     const session = getSession(req.params.id)
     if (!session) return res.status(404).json({ error: 'Session not found' })
-    if (session.status === 'completed') return res.json(session)
+    if (session.status === 'completed' || session.status === 'rewriting') {
+      console.log(`[agentclick] /wait returning ${session.status} for ${session.id} (revision=${session.revision})`)
+      return res.json(session)
+    }
     await new Promise(r => setTimeout(r, POLL_MS))
   }
 
   res.status(408).json({ error: 'timeout', message: 'User did not complete review within 5 minutes' })
 })
 
+// Agent updates session payload after rewriting
+app.put('/api/sessions/:id/payload', (req, res) => {
+  const session = getSession(req.params.id)
+  if (!session) return res.status(404).json({ error: 'Session not found' })
+  if (session.status !== 'rewriting') return res.status(400).json({ error: 'Session is not in rewriting state' })
+
+  console.log(`[agentclick] Payload update requested for ${session.id} (status=${session.status}, revision=${session.revision})`)
+  updateSessionPayload(req.params.id, req.body.payload)
+  const updated = getSession(req.params.id)
+  console.log(`[agentclick] Session ${session.id} payload updated, back to pending (revision=${updated?.revision ?? 'unknown'})`)
+  res.json({ ok: true })
+})
+
 // Web UI submits user actions
 app.post('/api/sessions/:id/complete', async (req, res) => {
   const session = getSession(req.params.id)
   if (!session) return res.status(404).json({ error: 'Session not found' })
 
+  // If user requested regeneration, set to rewriting (not completed) so agent can update
+  if (req.body.regenerate) {
+    setSessionRewriting(req.params.id, req.body)
+    console.log(`[agentclick] Session ${session.id} → rewriting:`, JSON.stringify(req.body, null, 2))
+    res.json({ ok: true, rewriting: true })
+    return
+  }
+
   completeSession(req.params.id, req.body)
 
   console.log(`[agentclick] Session ${session.id} completed:`, JSON.stringify(req.body, null, 2))

package/packages/server/src/store.ts

@@ -18,27 +18,41 @@ db.exec(`
     status TEXT NOT NULL DEFAULT 'pending',
     result TEXT,
     sessionKey TEXT,
-    createdAt INTEGER NOT NULL
+    createdAt INTEGER NOT NULL,
+    updatedAt INTEGER NOT NULL DEFAULT 0,
+    revision INTEGER NOT NULL DEFAULT 0
   )
 `)
 
+// Migrate existing tables: add updatedAt and revision if missing
+try {
+  db.exec(`ALTER TABLE sessions ADD COLUMN updatedAt INTEGER NOT NULL DEFAULT 0`)
+} catch { /* column already exists */ }
+try {
+  db.exec(`ALTER TABLE sessions ADD COLUMN revision INTEGER NOT NULL DEFAULT 0`)
+} catch { /* column already exists */ }
+
 export interface Session {
   id: string
   type: string
   payload: unknown
-  status: 'pending' | 'completed'
+  status: 'pending' | 'rewriting' | 'completed'
   result?: unknown
   sessionKey?: string
   createdAt: number
+  updatedAt: number
+  revision: number
 }
 
 export function createSession(session: Session): void {
   db.prepare(`
-    INSERT INTO sessions (id, type, payload, status, sessionKey, createdAt)
-    VALUES (@id, @type, @payload, @status, @sessionKey, @createdAt)
+    INSERT INTO sessions (id, type, payload, status, sessionKey, createdAt, updatedAt, revision)
+    VALUES (@id, @type, @payload, @status, @sessionKey, @createdAt, @updatedAt, @revision)
   `).run({
     ...session,
     payload: JSON.stringify(session.payload),
+    updatedAt: session.updatedAt || Date.now(),
+    revision: session.revision || 0,
   })
 }
 
@@ -55,8 +69,20 @@ export function listSessions(limit = 20): Session[] {
 
 export function completeSession(id: string, result: unknown): void {
   db.prepare(`
-    UPDATE sessions SET status = 'completed', result = ? WHERE id = ?
-  `).run(JSON.stringify(result), id)
+    UPDATE sessions SET status = 'completed', result = ?, updatedAt = ? WHERE id = ?
+  `).run(JSON.stringify(result), Date.now(), id)
+}
+
+export function setSessionRewriting(id: string, result: unknown): void {
+  db.prepare(`
+    UPDATE sessions SET status = 'rewriting', result = ?, updatedAt = ? WHERE id = ?
+  `).run(JSON.stringify(result), Date.now(), id)
+}
+
+export function updateSessionPayload(id: string, payload: unknown): void {
+  db.prepare(`
+    UPDATE sessions SET payload = ?, status = 'pending', result = NULL, updatedAt = ?, revision = revision + 1 WHERE id = ?
+  `).run(JSON.stringify(payload), Date.now(), id)
 }
 
 function deserialize(row: Record<string, unknown>): Session {
@@ -64,9 +90,11 @@ function deserialize(row: Record<string, unknown>): Session {
     id: row.id as string,
     type: row.type as string,
     payload: JSON.parse(row.payload as string),
-    status: row.status as 'pending' | 'completed',
+    status: row.status as 'pending' | 'rewriting' | 'completed',
     result: row.result ? JSON.parse(row.result as string) : undefined,
     sessionKey: row.sessionKey as string | undefined,
     createdAt: row.createdAt as number,
+    updatedAt: (row.updatedAt as number) || 0,
+    revision: (row.revision as number) || 0,
   }
 }