@better_openclaw/betterclaw 3.0.1 → 3.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better_openclaw/betterclaw",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "Intelligent event filtering, context tracking, and proactive triggers for BetterClaw",
   "license": "AGPL-3.0-only",
   "repository": {
@@ -9,12 +9,17 @@
   },
   "type": "module",
   "openclaw": {
-    "extensions": ["./src/index.ts"]
+    "extensions": [
+      "./src/index.ts"
+    ]
   },
   "dependencies": {
     "@sinclair/typebox": "^0.34.0"
   },
   "devDependencies": {
+    "@types/node": "^25.5.2",
+    "openclaw": "^2026.4.5",
+    "typescript": "^6.0.2",
     "vitest": "^3.0.0"
   }
 }

package/src/cli.ts

@@ -24,7 +24,14 @@ export const BETTERCLAW_COMMANDS = [
   "system.notify",
 ].sort();
 
+export const BETTERCLAW_TOOLS = ["check_tier", "get_context"];
+
 export function mergeAllowCommands(existing: string[], toAdd: string[]): string[] {
   const set = new Set([...existing, ...toAdd]);
   return [...set].sort();
 }
+
+export function mergeAlsoAllow(existing: string[], toAdd: string[]): string[] {
+  const set = new Set([...existing, ...toAdd]);
+  return [...set];
+}

package/src/context.ts

@@ -9,7 +9,7 @@ export class ContextManager {
   private contextPath: string;
   private patternsPath: string;
   private context: DeviceContext;
-  private runtimeState: RuntimeState = { tier: "free", smartMode: false };
+  private runtimeState: RuntimeState = { tier: null, smartMode: false };
   private timestamps: Record<string, number> = {};
   private deviceConfig: DeviceConfig = {};
 
@@ -44,6 +44,11 @@ export class ContextManager {
       const parsed = JSON.parse(raw);
       this.timestamps = parsed._timestamps ?? {};
       delete parsed._timestamps;
+      const savedTier = parsed._tier;
+      delete parsed._tier;
+      if (savedTier === "free" || savedTier === "premium") {
+        this.runtimeState = { ...this.runtimeState, tier: savedTier };
+      }
       this.context = parsed as DeviceContext;
     } catch {
       this.context = ContextManager.empty();
@@ -78,7 +83,7 @@ export class ContextManager {
 
   async save(): Promise<void> {
     await fs.mkdir(path.dirname(this.contextPath), { recursive: true });
-    const data = { ...this.context, _timestamps: this.timestamps };
+    const data = { ...this.context, _timestamps: this.timestamps, _tier: this.runtimeState.tier };
     await fs.writeFile(this.contextPath, JSON.stringify(data, null, 2) + "\n", "utf8");
     const configPath = path.join(path.dirname(this.contextPath), "device-config.json");
     await fs.writeFile(configPath, JSON.stringify(this.deviceConfig, null, 2) + "\n", "utf8");

package/src/index.ts

@@ -7,7 +7,7 @@ import { RulesEngine } from "./filter.js";
 import { PatternEngine } from "./patterns.js";
 import { processEvent } from "./pipeline.js";
 import type { PipelineDeps } from "./pipeline.js";
-import { BETTERCLAW_COMMANDS, mergeAllowCommands } from "./cli.js";
+import { BETTERCLAW_COMMANDS, BETTERCLAW_TOOLS, mergeAllowCommands, mergeAlsoAllow } from "./cli.js";
 import { storeJwt } from "./jwt.js";
 import { loadTriageProfile, runLearner } from "./learner.js";
 import { ReactionTracker } from "./reactions.js";
@@ -70,7 +70,6 @@ export default {
 
     // Calibration state
     let calibrationStartedAt: number | null = null;
-    let pingReceived = false;
 
     const calibrationFile = path.join(stateDir, "calibration.json");
     (async () => {
@@ -142,9 +141,9 @@ export default {
 
     // Ping health check
     api.registerGatewayMethod("betterclaw.ping", async ({ params, respond, context }) => {
-      const validTiers: Array<"free" | "premium" | "premium+"> = ["free", "premium", "premium+"];
+      const validTiers: Array<"free" | "premium"> = ["free", "premium"];
       const rawTier = (params as Record<string, unknown>)?.tier as string;
-      const tier = validTiers.includes(rawTier as any) ? (rawTier as "free" | "premium" | "premium+") : "free";
+      const tier = validTiers.includes(rawTier as any) ? (rawTier as "free" | "premium") : "free";
       const smartMode = (params as Record<string, unknown>)?.smartMode === true;
 
       const jwt = (params as Record<string, unknown>)?.jwt as string | undefined;
@@ -159,10 +158,8 @@ export default {
 
       ctxManager.setRuntimeState({ tier, smartMode });
 
-      pingReceived = true;
-
       // Initialize calibration on first premium ping
-      if ((tier === "premium" || tier === "premium+") && calibrationStartedAt === null) {
+      if (tier === "premium" && calibrationStartedAt === null) {
         const existingProfile = await loadTriageProfile(stateDir);
         if (existingProfile?.computedAt) {
           calibrationStartedAt = existingProfile.computedAt - config.calibrationDays * 86400;
@@ -365,7 +362,6 @@ export default {
     // Agent tools
     api.registerTool(
       createCheckTierTool(ctxManager, () => ({
-        pingReceived,
         calibrating: isCalibrating(),
         calibrationEndsAt: calibrationStartedAt
           ? calibrationStartedAt + config.calibrationDays * 86400
@@ -454,7 +450,7 @@ export default {
           if (ctxManager.getRuntimeState().smartMode) {
             // Scan reactions first (feeds into learner)
             try {
-              await scanPendingReactions({ reactions: reactionTracker, api, config, stateDir });
+              await scanPendingReactions({ reactions: reactionTracker, api });
             } catch (err) {
               api.logger.error(`betterclaw: reaction scan failed: ${err}`);
             }
@@ -490,37 +486,54 @@ export default {
 
         cmd
           .command("setup")
-          .description("Configure gateway allowedCommands for BetterClaw")
+          .description("Configure gateway allowedCommands and agent tools for BetterClaw")
           .option("--dry-run", "Preview changes without writing")
           .action(async (opts: { dryRun?: boolean }) => {
             try {
               const currentConfig = await api.runtime.config.loadConfig();
-              const existing: string[] =
-                (currentConfig as any)?.gateway?.nodes?.allowCommands ?? [];
-              const merged = mergeAllowCommands(existing, BETTERCLAW_COMMANDS);
-              const added = merged.length - existing.length;
+              const configObj = { ...currentConfig } as any;
+
+              // 1. Merge node allowedCommands
+              const existingCmds: string[] = configObj?.gateway?.nodes?.allowCommands ?? [];
+              const mergedCmds = mergeAllowCommands(existingCmds, BETTERCLAW_COMMANDS);
+              const addedCmds = mergedCmds.length - existingCmds.length;
+
+              // 2. Merge tools.alsoAllow for plugin tools
+              configObj.tools = configObj.tools ?? {};
+              const existingAllow: string[] = configObj.tools.alsoAllow ?? [];
+              const mergedAllow = mergeAlsoAllow(existingAllow, BETTERCLAW_TOOLS);
+              const addedTools = mergedAllow.length - existingAllow.length;
 
               if (opts.dryRun) {
-                console.log(`[dry-run] Would set ${merged.length} allowedCommands (${added} new)`);
-                if (added > 0) {
-                  const newCmds = merged.filter((c) => !existing.includes(c));
-                  console.log(`New commands: ${newCmds.join(", ")}`);
+                if (addedCmds > 0) {
+                  const newCmds = mergedCmds.filter((c) => !existingCmds.includes(c));
+                  console.log(`[dry-run] Would add ${addedCmds} node commands: ${newCmds.join(", ")}`);
+                }
+                if (addedTools > 0) {
+                  const newTools = mergedAllow.filter((t) => !existingAllow.includes(t));
+                  console.log(`[dry-run] Would add ${addedTools} agent tools to alsoAllow: ${newTools.join(", ")}`);
+                }
+                if (addedCmds === 0 && addedTools === 0) {
+                  console.log("[dry-run] Everything already configured.");
                 }
                 return;
               }
 
-              if (added === 0) {
-                console.log(`All ${BETTERCLAW_COMMANDS.length} BetterClaw commands already configured.`);
+              if (addedCmds === 0 && addedTools === 0) {
+                console.log("All BetterClaw commands and tools already configured.");
                 return;
               }
 
-              const configObj = { ...currentConfig } as any;
               configObj.gateway = configObj.gateway ?? {};
               configObj.gateway.nodes = configObj.gateway.nodes ?? {};
-              configObj.gateway.nodes.allowCommands = merged;
+              configObj.gateway.nodes.allowCommands = mergedCmds;
+              configObj.tools.alsoAllow = mergedAllow;
               await api.runtime.config.writeConfigFile(configObj);
 
-              console.log(`Added ${added} new commands (${merged.length} total). Restart gateway to apply.`);
+              const parts: string[] = [];
+              if (addedCmds > 0) parts.push(`${addedCmds} node commands`);
+              if (addedTools > 0) parts.push(`${addedTools} agent tools (${BETTERCLAW_TOOLS.join(", ")})`);
+              console.log(`Added ${parts.join(" + ")}. Restart gateway to apply.`);
             } catch (err) {
               console.error(`Failed to update config: ${err}`);
               process.exit(1);

package/src/jwt.ts

@@ -54,7 +54,7 @@ export async function verifyJwt(
     const valid = await crypto.subtle.verify(
       { name: "ECDSA", hash: "SHA-256" },
       publicKey,
-      signature,
+      signature as Uint8Array<ArrayBuffer>,
       signingInput
     );
     if (!valid) return null;

package/src/learner.ts

@@ -165,7 +165,7 @@ export async function runLearner(deps: RunLearnerDeps): Promise<void> {
     });
 
     // 11. Parse last assistant message — handle both string and content-block formats
-    const lastAssistant = messages.filter((m: any) => m.role === "assistant").pop();
+    const lastAssistant = (messages as any[]).filter((m) => m.role === "assistant").pop();
     if (lastAssistant) {
       const content = typeof lastAssistant.content === "string"
         ? lastAssistant.content

package/src/reaction-scanner.ts

@@ -17,9 +17,6 @@ export interface ClassificationResult {
 export interface ScanDeps {
   api: OpenClawPluginApi;
   reactions: ReactionTracker;
-  classificationModel: string;
-  classificationApiBase?: string;
-  getApiKey: () => Promise<string | undefined>;
 }
 
 // --- Helpers ---
@@ -151,7 +148,7 @@ export async function scanPendingReactions(deps: ScanDeps): Promise<void> {
       sessionKey: "main",
       limit: 200,
     });
-    messages = fetched;
+    messages = fetched as typeof messages;
   } catch (err) {
     api.logger.error(
       `reaction-scanner: failed to fetch session messages: ${err instanceof Error ? err.message : String(err)}`,
@@ -198,7 +195,7 @@ export async function scanPendingReactions(deps: ScanDeps): Promise<void> {
           limit: 5,
         });
 
-        const lastAssistant = classifyMessages.filter((m: any) => m.role === "assistant").pop();
+        const lastAssistant = (classifyMessages as any[]).filter((m) => m.role === "assistant").pop();
         if (lastAssistant) {
           const content = extractText(lastAssistant.content);
           if (content) {

package/src/tools/check-tier.ts

@@ -2,7 +2,6 @@ import { Type } from "@sinclair/typebox";
 import type { ContextManager } from "../context.js";
 
 export interface CheckTierState {
-  pingReceived: boolean;
   calibrating: boolean;
   calibrationEndsAt?: number;
 }
@@ -16,8 +15,9 @@ export function createCheckTierTool(ctx: ContextManager, getState: () => CheckTi
     parameters: Type.Object({}),
     async execute(_id: string, _params: Record<string, unknown>) {
       const state = getState();
+      const runtime = ctx.getRuntimeState();
 
-      if (!state.pingReceived) {
+      if (runtime.tier === null) {
         return {
           content: [{
             type: "text" as const,
@@ -28,13 +28,12 @@ export function createCheckTierTool(ctx: ContextManager, getState: () => CheckTi
               cacheInstruction: "Re-check in about a minute.",
             }, null, 2),
           }],
+          details: undefined,
         };
       }
-
-      const runtime = ctx.getRuntimeState();
       const cacheUntil = Math.floor(Date.now() / 1000) + 86400;
 
-      const isPremium = runtime.tier === "premium" || runtime.tier === "premium+";
+      const isPremium = runtime.tier === "premium";
 
       const dataPath = isPremium
         ? "Use node commands for current device readings: location.get, device.battery, health.steps, health.heartrate, health.hrv, health.sleep, health.distance, health.restinghr, health.workouts, health.summary, geofence.list. Use get_context for patterns, trends, history, and broad situational awareness — its device snapshot may not be perfectly recent but is useful for the big picture."
@@ -57,6 +56,7 @@ export function createCheckTierTool(ctx: ContextManager, getState: () => CheckTi
 
       return {
         content: [{ type: "text" as const, text: JSON.stringify(result, null, 2) }],
+        details: undefined,
       };
     },
   };

package/src/tools/get-context.ts

@@ -14,7 +14,7 @@ export function createGetContextTool(ctx: ContextManager, stateDir?: string) {
       const patterns = await ctx.readPatterns();
       const dataAge = ctx.getDataAge();
 
-      const isPremium = runtime.tier === "premium" || runtime.tier === "premium+";
+      const isPremium = runtime.tier === "premium";
 
       const result: Record<string, unknown> = {
         tierHint: {
@@ -53,6 +53,7 @@ export function createGetContextTool(ctx: ContextManager, stateDir?: string) {
 
       return {
         content: [{ type: "text" as const, text: JSON.stringify(result, null, 2) }],
+        details: undefined,
       };
     },
   };

package/src/types.ts

@@ -157,8 +157,7 @@ export interface DeviceConfig {
   proactiveEnabled?: boolean;
 }
 
-// Runtime state (not persisted)
 export interface RuntimeState {
-  tier: "free" | "premium" | "premium+";
+  tier: "free" | "premium" | null;
   smartMode: boolean;
 }