@joshualelon/clawdbot-skill-flow 2.3.2 → 2.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joshualelon/clawdbot-skill-flow",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "type": "module",
   "description": "Multi-step workflow orchestration plugin for Clawdbot",
   "keywords": [

package/src/engine/action-registry.ts

@@ -49,6 +49,9 @@ const sheetsAppendSchema = z.object({
       privateKey: z.string(),
     })
     .optional(),
+  useGogOAuth: z.boolean().default(true).describe(
+    "Use gog CLI OAuth instead of service account (recommended to avoid quota issues)"
+  ),
 });
 
 async function sheetsAppendExecute(
@@ -85,7 +88,8 @@ async function sheetsAppendExecute(
       cfg.worksheetName,
       [row],
       cfg.credentials as GoogleServiceAccountCredentials | undefined,
-      cfg.headerMode
+      cfg.headerMode,
+      cfg.useGogOAuth
     ),
     { maxAttempts: 3, delayMs: 1000, backoff: true }
   );

package/src/engine/executor.ts

@@ -96,14 +96,30 @@ async function executeStepActions(
           );
 
           // Inject result into session
-          if (result && typeof result === "object" && varName in result) {
-            const value = (result as Record<string, unknown>)[varName];
-            if (typeof value === "string" || typeof value === "number") {
+          if (result !== null && result !== undefined) {
+            if (typeof result === "object") {
+              // If result is an object, inject all its fields as separate variables
+              const resultObj = result as Record<string, unknown>;
+              for (const [key, value] of Object.entries(resultObj)) {
+                if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+                  modifiedSession = {
+                    ...modifiedSession,
+                    variables: {
+                      ...modifiedSession.variables,
+                      [key]: value,
+                    },
+                  };
+                }
+              }
+              // Update context for next actions
+              context.variables = modifiedSession.variables;
+            } else if (typeof result === "string" || typeof result === "number" || typeof result === "boolean") {
+              // If result is a primitive, inject it under varName
               modifiedSession = {
                 ...modifiedSession,
                 variables: {
                   ...modifiedSession.variables,
-                  [varName]: value,
+                  [varName]: result,
                 },
               };
               // Update context for next actions
@@ -192,18 +208,29 @@ async function executeStepActions(
             modifiedSession,
             enhancedApi
           );
-          if (result && typeof result === "object") {
-            if (varName in result) {
-              const value = result[varName];
-              if (typeof value === "string" || typeof value === "number") {
-                modifiedSession = {
-                  ...modifiedSession,
-                  variables: {
-                    ...modifiedSession.variables,
-                    [varName]: value,
-                  },
-                };
+          if (result !== null && result !== undefined) {
+            if (typeof result === "object") {
+              // If result is an object, inject all its fields as separate variables
+              for (const [key, value] of Object.entries(result)) {
+                if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+                  modifiedSession = {
+                    ...modifiedSession,
+                    variables: {
+                      ...modifiedSession.variables,
+                      [key]: value,
+                    },
+                  };
+                }
               }
+            } else if (typeof result === "string" || typeof result === "number" || typeof result === "boolean") {
+              // If result is a primitive, inject it under varName
+              modifiedSession = {
+                ...modifiedSession,
+                variables: {
+                  ...modifiedSession.variables,
+                  [varName]: result,
+                },
+              };
             }
           }
         }
@@ -339,7 +366,7 @@ export async function processStep(
 ): Promise<{
   reply: ReplyPayload;
   complete: boolean;
-  updatedVariables: Record<string, string | number>;
+  updatedVariables: Record<string, string | number | boolean>;
 }> {
   // Load action registry for declarative actions
   let actionRegistry: ActionRegistry | null = null;
@@ -446,7 +473,7 @@ export async function processStep(
  */
 function generateCompletionMessage(
   flow: FlowMetadata,
-  variables: Record<string, string | number>
+  variables: Record<string, string | number | boolean>
 ): string {
   let message = `✅ Flow "${flow.name}" completed!\n\n`;
 

package/src/engine/renderer.ts

@@ -17,7 +17,7 @@ import { normalizeButton } from "../validation.js";
  */
 function interpolateVariables(
   text: string,
-  variables: Record<string, string | number>
+  variables: Record<string, string | number | boolean>
 ): string {
   return text.replace(/\{\{(\w+)\}\}/g, (match, varName) => {
     const value = variables[varName];
@@ -31,7 +31,7 @@ function interpolateVariables(
 function renderTelegram(
   flowName: string,
   step: FlowStep,
-  variables: Record<string, string | number>
+  variables: Record<string, string | number | boolean>
 ): ReplyPayload {
   const message = interpolateVariables(step.message, variables);
 
@@ -83,7 +83,7 @@ function renderTelegram(
  */
 function renderFallback(
   step: FlowStep,
-  variables: Record<string, string | number>
+  variables: Record<string, string | number | boolean>
 ): ReplyPayload {
   const message = interpolateVariables(step.message, variables);
 

package/src/engine/transitions.ts

@@ -30,7 +30,7 @@ import { createInterpolationContext, interpolateConfig } from "./interpolation.j
  */
 function evaluateCondition(
   condition: FlowStep["condition"],
-  variables: Record<string, string | number>
+  variables: Record<string, string | number | boolean>
 ): boolean {
   if (!condition) {
     return false;
@@ -75,7 +75,7 @@ function evaluateCondition(
 function findNextStep(
   step: FlowStep,
   value: string | number,
-  variables: Record<string, string | number>
+  variables: Record<string, string | number | boolean>
 ): string | undefined {
   // 1. Check button-specific next
   if (step.buttons && step.buttons.length > 0) {

package/src/hooks/google-sheets.ts

@@ -68,6 +68,7 @@ export function createSheetsLogger(
     includeMetadata = true,
     credentials,
     headerMode = 'append',
+    useGogOAuth,
   } = options;
 
   return async (variable: string, value: string | number, session: FlowSession) => {
@@ -99,7 +100,7 @@ export function createSheetsLogger(
 
       // Append to sheet with retry
       await withRetry(
-        () => appendToSheet(spreadsheetId, worksheetName, [row], credentials, headerMode),
+        () => appendToSheet(spreadsheetId, worksheetName, [row], credentials, headerMode, useGogOAuth),
         { maxAttempts: 3, delayMs: 1000, backoff: true }
       );
     } catch (error) {
@@ -114,6 +115,120 @@ export function createSheetsLogger(
   };
 }
 
+/**
+ * Append rows to Google Sheet using gog OAuth credentials
+ */
+async function appendToSheetWithGogOAuth(
+  spreadsheetId: string,
+  worksheetName: string,
+  rows: Array<Record<string, unknown>>,
+  headerMode: HeaderMode = 'append'
+): Promise<void> {
+  if (rows.length === 0) {
+    return;
+  }
+
+  const accessToken = await getGogAccessToken();
+  const rowKeys = Object.keys(rows[0]!);
+
+  // Get existing data to check headers
+  const getUrl = `https://sheets.googleapis.com/v4/spreadsheets/${spreadsheetId}/values/${worksheetName}!A1:ZZ1`;
+  const getResponse = await fetch(getUrl, {
+    headers: { 'Authorization': `Bearer ${accessToken}` },
+  });
+
+  let existingHeaders: string[] = [];
+  if (getResponse.ok) {
+    const getData = await getResponse.json() as { values?: string[][] };
+    existingHeaders = getData.values?.[0] || [];
+  }
+
+  // Handle headers based on mode
+  if (existingHeaders.length === 0) {
+    // Empty sheet - write headers
+    const updateUrl = `https://sheets.googleapis.com/v4/spreadsheets/${spreadsheetId}/values/${worksheetName}!A1?valueInputOption=RAW`;
+    await fetch(updateUrl, {
+      method: 'PUT',
+      headers: {
+        'Authorization': `Bearer ${accessToken}`,
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        values: [rowKeys],
+      }),
+    });
+  } else if (!arraysEqual(existingHeaders, rowKeys)) {
+    // Headers don't match - apply mode
+    switch (headerMode) {
+      case 'strict':
+        throw new Error(
+          `Header mismatch in sheet "${worksheetName}". ` +
+          `Expected: ${existingHeaders.join(', ')}. ` +
+          `Got: ${rowKeys.join(', ')}. ` +
+          `Set headerMode to 'append' or 'overwrite' to handle this.`
+        );
+
+      case 'append': {
+        // Find new columns not in existing headers
+        const newColumns = rowKeys.filter(key => !existingHeaders.includes(key));
+        if (newColumns.length > 0) {
+          // Append new columns to the right
+          const updatedHeaders = [...existingHeaders, ...newColumns];
+          const updateUrl = `https://sheets.googleapis.com/v4/spreadsheets/${spreadsheetId}/values/${worksheetName}!A1?valueInputOption=RAW`;
+          await fetch(updateUrl, {
+            method: 'PUT',
+            headers: {
+              'Authorization': `Bearer ${accessToken}`,
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+              values: [updatedHeaders],
+            }),
+          });
+        }
+        break;
+      }
+
+      case 'overwrite': {
+        // Replace headers completely
+        const updateUrl = `https://sheets.googleapis.com/v4/spreadsheets/${spreadsheetId}/values/${worksheetName}!A1?valueInputOption=RAW`;
+        await fetch(updateUrl, {
+          method: 'PUT',
+          headers: {
+            'Authorization': `Bearer ${accessToken}`,
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({
+            values: [rowKeys],
+          }),
+        });
+        break;
+      }
+    }
+  }
+
+  // Convert rows to 2D array
+  const values = rows.map((row) => rowKeys.map((key) => row[key] ?? ""));
+
+  // Append data
+  const appendUrl = `https://sheets.googleapis.com/v4/spreadsheets/${spreadsheetId}/values/${worksheetName}!A:A:append?valueInputOption=RAW`;
+  const appendResponse = await fetch(appendUrl, {
+    method: 'POST',
+    headers: {
+      'Authorization': `Bearer ${accessToken}`,
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({
+      values,
+    }),
+  });
+
+  if (!appendResponse.ok) {
+    const errorText = await appendResponse.text();
+    throw new Error(`Failed to append to sheet: ${appendResponse.statusText} - ${errorText}`);
+  }
+}
+
 /**
  * Low-level utility to append rows to a Google Sheet.
  * Creates the worksheet if it doesn't exist, and adds headers on first write.
@@ -131,12 +246,23 @@ export async function appendToSheet(
   worksheetName: string,
   rows: Array<Record<string, unknown>>,
   credentials?: GoogleServiceAccountCredentials,
-  headerMode: HeaderMode = 'append'
+  headerMode: HeaderMode = 'append',
+  useGogOAuth?: boolean
 ): Promise<void> {
   if (rows.length === 0) {
     return;
   }
 
+  // Use gog OAuth if requested
+  if (useGogOAuth) {
+    return await appendToSheetWithGogOAuth(
+      spreadsheetId,
+      worksheetName,
+      rows,
+      headerMode
+    );
+  }
+
   const sheets = await createSheetsClient(credentials);
 
   // Ensure worksheet exists

package/src/hooks/types.ts

@@ -27,6 +27,7 @@ export interface SheetsLogOptions {
   includeMetadata?: boolean; // Add timestamp, userId, flowName
   credentials?: GoogleServiceAccountCredentials;
   headerMode?: HeaderMode; // How to handle header mismatches (default: 'append')
+  useGogOAuth?: boolean; // Use gog CLI OAuth instead of service account (default: true)
 }
 
 /**

package/src/types.ts

@@ -106,14 +106,14 @@ export interface FlowSession {
   currentStepId: string;
   senderId: string;
   channel: string;
-  variables: Record<string, string | number>;
+  variables: Record<string, string | number | boolean>;
   startedAt: number;
   lastActivityAt: number;
 }
 
 export interface TransitionResult {
   nextStepId?: string;
-  variables: Record<string, string | number>;
+  variables: Record<string, string | number | boolean>;
   complete: boolean;
   error?: string;
   message?: string;