🔧 update (workflow): merge dev pipeline changes

Author: warengonzaga

.github/workflows/landing.yml

@@ -31,7 +31,7 @@ jobs:
         run: bun run --cwd src/landing build
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4
+        uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
         with:
           path: src/landing/dist
 

Dockerfile

@@ -1,5 +1,5 @@
 # ── Stage 1: Install + Build ────────────────────────────────────────
-FROM oven/bun:1.3.11 AS builder
+FROM oven/bun:1.3.13 AS builder
 
 WORKDIR /app
 
@@ -45,7 +45,7 @@ COPY . .
 RUN bun run build
 
 # ── Stage 2: Production ─────────────────────────────────────────────
-FROM oven/bun:1.3.11-slim AS production
+FROM oven/bun:1.3.13-slim AS production
 
 WORKDIR /app
 

packages/config/package.json

@@ -33,6 +33,6 @@
     "@tinyclaw/types": "workspace:*",
     "@tinyclaw/logger": "workspace:*",
     "@wgtechlabs/config-engine": "^0.1.0",
-    "zod": "^3.24.0"
+    "zod": "^4.4.3"
   }
 }

packages/shield/src/matcher.ts

@@ -41,6 +41,17 @@ export interface MatchResult {
   matchValue: string;
 }
 
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+
+/**
+ * Tool argument keys that carry document payloads (not SQL parameters).
+ * Excluded from SQL injection scanning to prevent false positives on
+ * document writes (e.g. write_file with `content`, chat with `message`).
+ */
+const CONTENT_FIELDS: ReadonlySet<string> = new Set(['content', 'body', 'message', 'text']);
+
 // ---------------------------------------------------------------------------
 // Directive parsing
 // ---------------------------------------------------------------------------
@@ -142,7 +153,17 @@ function evaluateCondition(
 
     // "tool.call with arguments containing SQL syntax (DROP, DELETE, UNION, --)"
     if (lc.includes('arguments containing')) {
-      const argsStr = JSON.stringify(event.toolArgs ?? {}).toLowerCase();
+      // Only scan fields that could be SQL injection vectors.
+      // Exclude content-body fields (document payloads written to files,
+      // not SQL parameters) to prevent false positives.
+      const rawArgs = event.toolArgs ?? {};
+      const filteredArgs: Record<string, unknown> = {};
+      for (const [key, val] of Object.entries(rawArgs)) {
+        if (!CONTENT_FIELDS.has(key)) {
+          filteredArgs[key] = val;
+        }
+      }
+      const argsStr = JSON.stringify(filteredArgs).toLowerCase();
       // Extract keywords from parenthetical list
       const openIdx = condition.indexOf('(');
       const closeIdx = openIdx >= 0 ? condition.indexOf(')', openIdx + 1) : -1;
@@ -152,7 +173,13 @@ function evaluateCondition(
           .split(',')
           .map((k) => k.trim().toLowerCase());
         for (const keyword of keywords) {
-          if (keyword && argsStr.includes(keyword)) {
+          if (!keyword) continue;
+          if (keyword === '--') {
+            // Match SQL comment marker (--) but NOT markdown separators (---)
+            if (/(?<!-)--(?!-)/.test(argsStr)) {
+              return { matchedOn: 'tool.args', matchValue: keyword };
+            }
+          } else if (argsStr.includes(keyword)) {
             return { matchedOn: 'tool.args', matchValue: keyword };
           }
         }

packages/shield/tests/matcher.test.ts

@@ -127,6 +127,62 @@ describe('matchEvent — tool.call', () => {
     expect(matches).toHaveLength(0);
   });
 
+  it('should not match -- in markdown separators (---) inside content fields', () => {
+    const threat = makeThreat({
+      recommendationAgent:
+        'BLOCK: tool.call with arguments containing SQL syntax (DROP, DELETE, UNION, --)',
+    });
+
+    const event: ShieldEvent = {
+      scope: 'tool.call',
+      toolName: 'heartware_write',
+      toolArgs: {
+        filename: 'FRIEND.md',
+        content:
+          '# About My Owner\n\n- **Name:** Waren\n\n---\nThis file helps me understand you better.',
+      },
+    };
+
+    const matches = matchEvent(event, [threat]);
+    expect(matches).toHaveLength(0);
+  });
+
+  it('should not false-positive on content-body fields containing SQL words', () => {
+    const threat = makeThreat({
+      recommendationAgent:
+        'BLOCK: tool.call with arguments containing SQL syntax (DROP, DELETE, UNION, --)',
+    });
+
+    const event: ShieldEvent = {
+      scope: 'tool.call',
+      toolName: 'heartware_write',
+      toolArgs: {
+        filename: 'MEMORY.md',
+        content: 'User asked me to delete the old notes and drop the schedule',
+      },
+    };
+
+    const matches = matchEvent(event, [threat]);
+    expect(matches).toHaveLength(0);
+  });
+
+  it('should still block SQL keywords in non-content args', () => {
+    const threat = makeThreat({
+      recommendationAgent:
+        'BLOCK: tool.call with arguments containing SQL syntax (DROP, DELETE, UNION, --)',
+    });
+
+    const event: ShieldEvent = {
+      scope: 'tool.call',
+      toolName: 'db_query',
+      toolArgs: { query: 'DROP TABLE users; -- pwned' },
+    };
+
+    const matches = matchEvent(event, [threat]);
+    expect(matches.length).toBeGreaterThan(0);
+    expect(matches[0].matchedOn).toBe('tool.args');
+  });
+
   it('should match compatible scope/category', () => {
     const threat = makeThreat({
       category: 'prompt', // prompt category

src/cli/src/commands/start.ts

@@ -1376,7 +1376,18 @@ export async function startCommand(): Promise<void> {
   const gateway = createGateway();
 
   // Register web UI as a channel sender (SSE push)
-  gateway.register('web', webUI.getChannelSender());
+  const webSender = webUI.getChannelSender();
+  gateway.register('web', webSender);
+
+  // If the owner was claimed via CLI setup, the persisted ownerId has
+  // prefix "cli:" but only a "web" channel is registered. Register a
+  // "cli" alias so nudges for "cli:owner" route through the web sender.
+  if (persistedOwnerId?.startsWith('cli:') && !gateway.getRegisteredChannels().includes('cli')) {
+    gateway.register('cli', {
+      ...webSender,
+      name: `${webSender.name} (cli alias)`,
+    });
+  }
 
   // --- Nudge Engine -------------------------------------------------------
 

src/cli/tests/commands/start.test.ts

@@ -272,9 +272,11 @@ const mockWebUIStop = mock(() => Promise.resolve());
 
 // ── Mock @tinyclaw/gateway ────────────────────────────────────────────
 
+const mockGatewayRegister = mock(() => {});
+
 mock.module('@tinyclaw/gateway', () => ({
   createGateway: mock(() => ({
-    register: mock(() => {}),
+    register: mockGatewayRegister,
     unregister: mock(() => {}),
     send: mock(() => Promise.resolve({ success: true, channel: 'web', userId: 'web:owner' })),
     broadcast: mock(() => Promise.resolve([])),
@@ -375,6 +377,7 @@ beforeEach(() => {
     readyTag: 'Tiny Claw#1234',
     lastError: null,
   }));
+  mockGatewayRegister.mockClear();
 });
 
 afterEach(() => {
@@ -395,6 +398,31 @@ describe('startCommand', () => {
     expect(mockWebUIStart).toHaveBeenCalled();
   });
 
+  test('registers cli channel alias for cli-prefixed owner', async () => {
+    await startCommand();
+    const registeredChannels = mockGatewayRegister.mock.calls.map(
+      ([channel]: [string, ...unknown[]]) => channel,
+    );
+    expect(registeredChannels).toContain('cli');
+  });
+
+  test('does not register cli channel alias for non-cli-prefixed owner', async () => {
+    mockConfigGet.mockImplementation((key: string) => {
+      if (key === 'providers.starterBrain.model') return 'kimi-k2.5:cloud';
+      if (key === 'providers.starterBrain.baseUrl') return 'https://ollama.com';
+      if (key === 'heartware.seed') return 42;
+      if (key === 'owner.ownerId') return 'web:owner';
+      if (key === 'channels.discord.enabled') return true;
+      if (key === 'plugins.enabled') return ['@tinyclaw/plugin-channel-discord'];
+      return undefined;
+    });
+    await startCommand();
+    const registeredChannels = mockGatewayRegister.mock.calls.map(
+      ([channel]: [string, ...unknown[]]) => channel,
+    );
+    expect(registeredChannels).not.toContain('cli');
+  });
+
   test('initializes heartware', async () => {
     await startCommand();
     expect(mockHeartwareInitialize).toHaveBeenCalled();

src/web/package.json

@@ -23,7 +23,7 @@
     "@tinyclaw/logger": "workspace:*",
     "@tinyclaw/types": "workspace:*",
     "dompurify": "^3.2.6",
-    "marked": "^17.0.3",
+    "marked": "^18.0.0",
     "qrcode": "^1.5.4",
     "svelte": "^5.20.1"
   },