twinclaw 1.3.0 → 1.3.1

package/dist/agents/self-setup-agent.js

@@ -1,54 +1,41 @@
-var _a;
 import { logThought } from '../utils/logger.js';
 import { checkFirstInteraction, loadUserMemory, saveUserMemory, getDefaultUserMemory, } from '../services/user-memory.js';
+const ONBOARDING_SYSTEM_PROMPT = `You are having a natural conversation to get to know the user better. Your goal is to learn about them in a friendly, casual way - like two people chatting over coffee.
+
+Topics to naturally explore (one at a time, naturally):
+- What they do for work/study
+- What they're currently working on or interested in
+- What tools/tech they use
+- What they like to do outside of work
+- How they prefer to communicate (brief vs detailed, technical vs simple)
+- What their goals are
+
+Guidelines:
+- Be conversational and warm, not robotic
+- Ask one question at a time, building on what they share
+- Don't use numbered lists or formal questionnaires
+- If they share multiple things, acknowledge them naturally before asking follow-ups
+- When you feel you've learned enough (after 3-5 exchanges), ask if they'd like you to remember this info
+
+Important: Extract key information from their responses and include it in your response as a JSON comment like:
+<!-- INFO: {"role": "developer", "interests": "AI, music", "goals": "building automation"} -->
+
+This JSON will be automatically parsed to save their profile. Use these keys:
+- role (what they do)
+- company (where they work)
+- currentProject (what they're working on)
+- tools (comma-separated list of tools they use)
+- interests (what they like doing)
+- communicationPreference (brief, detailed, or contextual)
+- frustrations (what frustrates them about AI)
+- goals (what they're trying to achieve)
+- technicalLevel (beginner, intermediate, or expert)`;
 export class SelfSetupAgent {
     #userId;
-    #phase = 'detecting';
-    #discoveryAnswers = {};
-    #discoveryQuestionIndex = 0;
-    #messageCount = 0;
-    static DISCOVERY_QUESTIONS = [
-        {
-            category: 'professional',
-            question: "What do you do? (Role, company, industry)",
-            field: 'role',
-        },
-        {
-            category: 'professional',
-            question: "What are you working on right now? (Current projects)",
-            field: 'currentProject',
-        },
-        {
-            category: 'professional',
-            question: "What tools do you use daily? (Tech stack, platforms)",
-            field: 'tools',
-        },
-        {
-            category: 'personal',
-            question: "What do you like to do outside of work?",
-            field: 'interests',
-        },
-        {
-            category: 'communication',
-            question: "How do you like information presented? (Brief vs detailed, casual vs formal)",
-            field: 'communicationPreference',
-        },
-        {
-            category: 'communication',
-            question: "What frustrates you about AI assistants?",
-            field: 'frustrations',
-        },
-        {
-            category: 'goals',
-            question: "What are you trying to achieve? (Short and long term)",
-            field: 'goals',
-        },
-        {
-            category: 'technical',
-            question: "How technical should I be with you?",
-            field: 'technicalLevel',
-        },
-    ];
+    #phase = 'idle';
+    #conversationTurn = 0;
+    #extractedInfo = {};
+    #confirmed = false;
     constructor(userId) {
         this.#userId = userId;
     }
@@ -61,215 +48,147 @@ export class SelfSetupAgent {
     isComplete() {
         return this.#phase === 'completed';
     }
-    processFirstMessage(userMessage) {
-        this.#messageCount++;
-        if (this.#phase === 'detecting') {
-            return this.#startWarmIntro();
-        }
-        if (this.#phase === 'warm_intro') {
-            return this.#handleWarmIntroResponse(userMessage);
-        }
-        if (this.#phase === 'discovery') {
-            return this.#handleDiscoveryResponse(userMessage);
-        }
-        if (this.#phase === 'synthesis') {
-            return this.#handleSynthesisResponse(userMessage);
-        }
-        if (this.#phase === 'completed') {
+    getSystemPrompt() {
+        return ONBOARDING_SYSTEM_PROMPT;
+    }
+    getConversationHistory() {
+        return [
+            {
+                role: 'system',
+                content: ONBOARDING_SYSTEM_PROMPT,
+            },
+        ];
+    }
+    processLLMResponse(llmText) {
+        this.#conversationTurn++;
+        const extracted = this.#extractInfo(llmText);
+        if (extracted) {
+            this.#extractedInfo = { ...this.#extractedInfo, ...extracted };
+        }
+        if (this.#conversationTurn >= 4 && !this.#confirmed) {
+            this.#phase = 'confirming';
             return {
-                text: "Setup is complete! How can I help you today?",
+                text: llmText,
                 phase: this.#phase,
-                isComplete: true,
-                needsMoreInfo: false,
+                isComplete: false,
+                needsMoreInfo: true,
+                extractedInfo: this.#extractedInfo,
             };
         }
-        return {
-            text: "I'm not sure what to do next. Let me start over.",
-            phase: this.#phase,
-            isComplete: false,
-            needsMoreInfo: true,
-        };
-    }
-    #startWarmIntro() {
-        this.#phase = 'warm_intro';
-        logThought(`[SelfSetupAgent] Starting warm intro for user: ${this.#userId}`);
-        return {
-            text: `Hey! I'm noticing this is our first conversation. Before we dive into anything, I'd love to take a few minutes to get to know you better so I can be actually helpful (not just generic AI helpful).
-
-Think of this as a quick coffee chat where I learn what makes you tick. Cool?
-
-To start - what do you do, and what kind of thing are you looking to build?`,
-            phase: this.#phase,
-            isComplete: false,
-            needsMoreInfo: true,
-        };
-    }
-    #handleWarmIntroResponse(userMessage) {
-        this.#discoveryAnswers.role = userMessage;
-        this.#phase = 'discovery';
-        this.#discoveryQuestionIndex = 0;
-        return this.#askNextDiscoveryQuestion();
-    }
-    #askNextDiscoveryQuestion() {
-        const question = _a.DISCOVERY_QUESTIONS[this.#discoveryQuestionIndex];
-        if (!question) {
-            return this.#moveToSynthesis();
+        if (this.#confirmed) {
+            return this.#completeSetup();
         }
-        const questionText = question.question;
+        this.#phase = 'learning';
         return {
-            text: questionText,
+            text: llmText,
             phase: this.#phase,
             isComplete: false,
             needsMoreInfo: true,
+            extractedInfo: this.#extractedInfo,
         };
     }
-    #handleDiscoveryResponse(userMessage) {
-        const question = _a.DISCOVERY_QUESTIONS[this.#discoveryQuestionIndex];
-        if (question) {
-            const field = question.field;
-            this.#discoveryAnswers[field] = userMessage;
-        }
-        this.#discoveryQuestionIndex++;
-        if (this.#discoveryQuestionIndex >= _a.DISCOVERY_QUESTIONS.length) {
-            return this.#moveToSynthesis();
-        }
-        return this.#askNextDiscoveryQuestion();
+    confirmAndSave() {
+        this.#confirmed = true;
+        return this.#completeSetup();
     }
-    #moveToSynthesis() {
-        this.#phase = 'synthesis';
-        const answers = this.#discoveryAnswers;
-        const synthesis = this.#buildSynthesis(answers);
+    skipOrDecline() {
+        this.#phase = 'completed';
         return {
-            text: `${synthesis}
-
-Did I get that right? Anything I should adjust or add?`,
+            text: "No problem! Whenever you're ready to share more about yourself, just let me know. How can I help you today?",
             phase: this.#phase,
-            isComplete: false,
-            needsMoreInfo: true,
+            isComplete: true,
+            needsMoreInfo: false,
         };
     }
-    #buildSynthesis(answers) {
-        const insights = [];
-        if (answers.role) {
-            insights.push(`You're working as ${answers.role}`);
-        }
-        if (answers.currentProject) {
-            insights.push(`currently focused on ${answers.currentProject}`);
-        }
-        if (answers.tools && answers.tools.length > 0) {
-            insights.push(`using tools like ${answers.tools}`);
-        }
-        if (answers.interests) {
-            insights.push(`into ${answers.interests} outside work`);
-        }
-        let preference = 'contextual';
-        if (answers.communicationPreference) {
-            if (answers.communicationPreference.includes('brief')) {
-                preference = 'brief';
+    #completeSetup() {
+        if (Object.keys(this.#extractedInfo).length > 0) {
+            const memory = getDefaultUserMemory();
+            if (this.#extractedInfo.role) {
+                memory.profile.identity.role = String(this.#extractedInfo.role);
             }
-            else if (answers.communicationPreference.includes('detail')) {
-                preference = 'comprehensive';
+            if (this.#extractedInfo.company) {
+                memory.profile.identity.company = String(this.#extractedInfo.company);
             }
+            if (this.#extractedInfo.currentProject) {
+                memory.profile.professionalBackground.currentFocus = String(this.#extractedInfo.currentProject);
+            }
+            if (this.#extractedInfo.tools) {
+                const tools = String(this.#extractedInfo.tools).split(',').map(t => t.trim()).filter(Boolean);
+                memory.profile.professionalBackground.toolsAndPlatforms = tools;
+            }
+            if (this.#extractedInfo.interests) {
+                memory.profile.personalContext.interests = String(this.#extractedInfo.interests).split(',').map(t => t.trim()).filter(Boolean);
+            }
+            if (this.#extractedInfo.goals) {
+                memory.profile.goals.shortTerm = [String(this.#extractedInfo.goals)];
+            }
+            if (this.#extractedInfo.technicalLevel) {
+                const level = String(this.#extractedInfo.technicalLevel).toLowerCase();
+                if (level.includes('beginner')) {
+                    memory.profile.identity.technicalLevel = 'beginner';
+                }
+                else if (level.includes('expert') || level.includes('advanced')) {
+                    memory.profile.identity.technicalLevel = 'expert';
+                }
+                else {
+                    memory.profile.identity.technicalLevel = 'intermediate';
+                }
+            }
+            if (this.#extractedInfo.communicationPreference) {
+                const pref = String(this.#extractedInfo.communicationPreference).toLowerCase();
+                if (pref.includes('brief')) {
+                    memory.profile.communicationStyle.detailLevel = 'brief';
+                }
+                else if (pref.includes('detail')) {
+                    memory.profile.communicationStyle.detailLevel = 'comprehensive';
+                }
+                else {
+                    memory.profile.communicationStyle.detailLevel = 'contextual';
+                }
+            }
+            if (this.#extractedInfo.frustrations) {
+                memory.profile.communicationStyle.frustrations = [String(this.#extractedInfo.frustrations)];
+            }
+            saveUserMemory(this.#userId, memory);
+            logThought(`[SelfSetupAgent] Saved user profile for: ${this.#userId}`);
         }
-        insights.push(`prefer ${preference} communication`);
-        if (answers.goals) {
-            insights.push(`your goals include ${answers.goals}`);
-        }
-        const synthesis = insights.join('. ');
-        return `Alright, here's what I'm picking up:\n- ${insights.join('\n- ')}`;
-    }
-    #handleSynthesisResponse(userMessage) {
-        const lowerResponse = userMessage.toLowerCase();
-        if (lowerResponse.includes('yes') || lowerResponse.includes('right') || lowerResponse.includes('correct') || lowerResponse.includes('yep')) {
-            return this.#completeSetup();
-        }
-        return this.#completeSetup();
-    }
-    #completeSetup() {
-        this.#phase = 'file_creation';
-        const memory = this.#buildUserMemory();
-        saveUserMemory(this.#userId, memory);
         this.#phase = 'completed';
-        logThought(`[SelfSetupAgent] Completed setup for user: ${this.#userId}`);
         return {
-            text: `Cool, I've saved all this so I don't forget. I created a few quick reference files:
-- Your profile & preferences
-- How you like me to communicate
-- What you're currently working on
-- Quick facts I can reference
+            text: `Got it! I've saved what you shared about yourself. I'll use this to tailor my responses to you.
 
-These will help me be consistent and actually useful. I'll update them as I learn more about you.
-
-We're all set! From now on, I'll:
-✓ Remember our conversations and what matters to you
-✓ Adapt my style to what works for you
+From now on, I'll:
+✓ Remember what matters to you
+✓ Adapt my communication style to your preferences  
 ✓ Keep track of your projects and goals
-✓ Update my notes as things change
 
-If I ever seem off-base or forget something important, just call me out. Ready to jump in?`,
+If anything changes or you want to update your info, just let me know. Ready to dive in!`,
             phase: this.#phase,
             isComplete: true,
             needsMoreInfo: false,
+            extractedInfo: this.#extractedInfo,
         };
     }
-    #buildUserMemory() {
-        const defaultMemory = getDefaultUserMemory();
-        const answers = this.#discoveryAnswers;
-        defaultMemory.profile.identity.role = answers.role;
-        defaultMemory.profile.identity.technicalLevel = this.#mapTechnicalLevel(answers.technicalLevel);
-        defaultMemory.profile.professionalBackground.currentFocus = answers.currentProject;
-        if (answers.tools) {
-            defaultMemory.profile.professionalBackground.toolsAndPlatforms = Array.isArray(answers.tools)
-                ? answers.tools
-                : [answers.tools];
-        }
-        defaultMemory.profile.personalContext.interests = answers.interests ? [answers.interests] : [];
-        if (answers.communicationPreference) {
-            defaultMemory.profile.communicationStyle.detailLevel = this.#mapDetailLevel(answers.communicationPreference);
+    #extractInfo(text) {
+        const infoMatch = text.match(/<!--\s*INFO:\s*(\{[^}]+\})\s*-->/);
+        if (!infoMatch) {
+            return null;
         }
-        if (answers.frustrations) {
-            defaultMemory.profile.communicationStyle.frustrations = Array.isArray(answers.frustrations)
-                ? answers.frustrations
-                : [answers.frustrations];
+        try {
+            return JSON.parse(infoMatch[1]);
         }
-        if (answers.goals) {
-            defaultMemory.profile.goals.shortTerm = [answers.goals];
+        catch {
+            logThought(`[SelfSetupAgent] Failed to parse extracted info: ${infoMatch[1]}`);
+            return null;
         }
-        return defaultMemory;
-    }
-    #mapTechnicalLevel(level) {
-        if (!level)
-            return undefined;
-        const lower = level.toLowerCase();
-        if (lower.includes('expert') || lower.includes('advanced'))
-            return 'expert';
-        if (lower.includes('beginner') || lower.includes('new'))
-            return 'beginner';
-        return 'intermediate';
-    }
-    #mapDetailLevel(pref) {
-        if (!pref)
-            return undefined;
-        const lower = pref.toLowerCase();
-        if (lower.includes('brief') || lower.includes('short'))
-            return 'brief';
-        if (lower.includes('detail') || lower.includes('comprehensive'))
-            return 'comprehensive';
-        return 'contextual';
-    }
-    cancel() {
-        this.#phase = 'cancelled';
-        logThought(`[SelfSetupAgent] Setup cancelled for user: ${this.#userId}`);
     }
     getState() {
         return {
             phase: this.#phase,
-            messageCount: this.#messageCount,
-            answersCount: Object.keys(this.#discoveryAnswers).length,
+            turn: this.#conversationTurn,
+            extractedCount: Object.keys(this.#extractedInfo).length,
         };
     }
 }
-_a = SelfSetupAgent;
 export function createSelfSetupAgent(userId) {
     if (!checkFirstInteraction(userId)) {
         return null;
@@ -279,3 +198,10 @@ export function createSelfSetupAgent(userId) {
 export function getExistingUserMemory(userId) {
     return loadUserMemory(userId);
 }
+export function getOrCreateAgent(userId, existing) {
+    if (existing && existing.phase !== 'completed') {
+        return existing;
+    }
+    const newAgent = createSelfSetupAgent(userId);
+    return newAgent ?? existing;
+}

package/dist/core/gateway.js

@@ -170,24 +170,44 @@ export class Gateway {
         const sessionId = `${message.platform}:${message.senderId}`;
         const userId = message.senderId;
         const existingAgent = this.#selfSetupAgents.get(userId);
-        if (existingAgent) {
-            const response = existingAgent.processFirstMessage(normalizedText);
-            if (response.isComplete) {
-                this.#selfSetupAgents.delete(userId);
-                if (response.isComplete && !response.needsMoreInfo) {
-                    return response.text;
-                }
-            }
-            return response.text;
+        if (existingAgent && !existingAgent.isComplete()) {
+            return this.#runOnboardingConversation(existingAgent, normalizedText, sessionId);
         }
         const newAgent = createSelfSetupAgent(userId);
         if (newAgent) {
             this.#selfSetupAgents.set(userId, newAgent);
-            const response = newAgent.processFirstMessage(normalizedText);
-            return response.text;
+            return this.#runOnboardingConversation(newAgent, normalizedText, sessionId);
         }
         return this.processText(sessionId, normalizedText);
     }
+    async #runOnboardingConversation(agent, userMessage, sessionId) {
+        const messages = [
+            { role: 'system', content: agent.getSystemPrompt() },
+            ...agent.getConversationHistory(),
+            { role: 'user', content: userMessage },
+        ];
+        try {
+            const response = await this.#router.createChatCompletion(messages, undefined, { sessionId });
+            if (!response.content) {
+                return "I'm having trouble thinking right now. Let's try again.";
+            }
+            const result = agent.processLLMResponse(response.content);
+            if (result.isComplete && !result.needsMoreInfo) {
+                this.#selfSetupAgents.delete(agent.userId);
+                return result.text;
+            }
+            if (result.phase === 'confirming') {
+                const confirmMessage = result.text + "\n\nWould you like me to remember this? (yes/no or just tell me more)";
+                return confirmMessage;
+            }
+            return result.text;
+        }
+        catch (err) {
+            const errorMsg = err instanceof Error ? err.message : String(err);
+            logThought(`[SelfSetupAgent] LLM error: ${errorMsg}`);
+            return "I'm having trouble continuing our conversation. Let's try again - what would you like to talk about?";
+        }
+    }
     async processText(sessionId, text) {
         const normalizedText = text.trim();
         if (!normalizedText) {

package/dist/services/model-router.js

@@ -1,6 +1,6 @@
 import { randomUUID } from 'node:crypto';
 import { MODEL_SLOT_IDS, } from '../types/model-routing.js';
-import { scrubSensitiveText } from '../utils/logger.js';
+import { scrubSensitiveText, logThought } from '../utils/logger.js';
 import { getModelRoutingSetting, listModelRoutingEvents, saveModelRoutingEvent, saveModelRoutingSetting, } from './db-model-routing.js';
 import { getSecretVaultService } from './secret-vault.js';
 import { getGitHubCopilotService } from './github-copilot-service.js';
@@ -434,11 +434,18 @@ export class ModelRouter {
     }
     async getApiKey(config) {
         const envName = config.apiKeyEnvName;
+        const providerId = this.resolveProviderId(config);
         const key = getSecretVaultService().readSecret(envName);
         if (!key) {
-            console.warn(`Warning: API key ${envName} is not set in environment.`);
+            const configKey = getConfigValue(envName);
+            if (configKey) {
+                logThought(`[Router] Using API key from config for ${providerId}: ${envName.slice(0, 8)}...`);
+                return configKey;
+            }
+            console.warn(`[Router] Warning: API key ${envName} is not set in environment or config (provider: ${providerId}).`);
             return '';
         }
+        logThought(`[Router] Using API key from vault for ${providerId}: ${envName.slice(0, 8)}...`);
         if (envName !== 'GITHUB_TOKEN') {
             return key;
         }
@@ -1009,19 +1016,26 @@ export class ModelRouter {
     }
     loadModelsFromConfig() {
         const configModels = [];
+        const definitionsJson = getConfigValue('MODEL_DEFINITIONS');
+        const primaryModel = getConfigValue('PRIMARY_MODEL');
+        logThought(`[Router] loadModelsFromConfig: PRIMARY_MODEL=${primaryModel}, MODEL_DEFINITIONS present=${!!definitionsJson}`);
         // First, check if config.models.definitions has any models (from model picker)
         // If so, use those instead of hardcoded fallbacks
-        const definitionsJson = getConfigValue('MODEL_DEFINITIONS');
         if (definitionsJson) {
             try {
                 const definitions = JSON.parse(definitionsJson);
                 if (definitions && definitions.length > 0) {
                     const primaryModel = getConfigValue('PRIMARY_MODEL') ?? '';
+                    // Normalize model ID for comparison (modal/zai-glm-5-fp8 -> modal-zai-glm-5-fp8)
+                    const normalizeId = (id) => id.replace('/', '-').toLowerCase();
+                    const normalizedPrimary = normalizeId(primaryModel);
                     // Sort models so primary is first, then the rest
                     const sortedDefinitions = [...definitions].sort((a, b) => {
-                        if (a.id === primaryModel)
+                        const aNorm = normalizeId(a.id);
+                        const bNorm = normalizeId(b.id);
+                        if (aNorm === normalizedPrimary)
                             return -1;
-                        if (b.id === primaryModel)
+                        if (bNorm === normalizedPrimary)
                             return 1;
                         return 0;
                     });
@@ -1033,13 +1047,36 @@ export class ModelRouter {
                             apiKeyEnvName: def.apiKeyEnvName,
                         });
                     }
-                    // If we have models from definitions, return them
-                    if (configModels.length > 0) {
-                        return configModels;
+                    // Even with definitions, add fallback providers in case primary fails
+                    // This ensures we have working alternatives if the user's primary model fails
+                    const groqApiKey = getConfigValue('GROQ_API_KEY');
+                    const openRouterApiKey = getConfigValue('OPENROUTER_API_KEY');
+                    const existingIds = new Set(configModels.map(m => m.id));
+                    // Add Groq as fallback if not already in definitions
+                    if (groqApiKey && !existingIds.has('groq-qwen3-32b') && !existingIds.has(MODEL_SLOT_IDS.FALLBACK_1)) {
+                        configModels.push({
+                            id: MODEL_SLOT_IDS.FALLBACK_1,
+                            model: 'qwen/qwen3-32b',
+                            baseURL: 'https://api.groq.com/openai/v1/chat/completions',
+                            apiKeyEnvName: 'GROQ_API_KEY',
+                        });
+                    }
+                    // Add OpenRouter free model as secondary fallback
+                    if (openRouterApiKey && !existingIds.has('openrouter-arcee-ai-trinity-mini-free') && !existingIds.has(MODEL_SLOT_IDS.FALLBACK_2)) {
+                        configModels.push({
+                            id: MODEL_SLOT_IDS.FALLBACK_2,
+                            model: 'arcee-ai/trinity-mini:free',
+                            baseURL: 'https://openrouter.ai/api/v1/chat/completions',
+                            apiKeyEnvName: 'OPENROUTER_API_KEY',
+                        });
                     }
+                    logThought(`[Router] Loaded ${configModels.length} models from definitions. PRIMARY: ${primaryModel}`);
+                    // Return all models including fallbacks
+                    return configModels;
                 }
             }
-            catch {
+            catch (e) {
+                logThought(`[Router] Failed to load definitions: ${e}`);
                 // JSON parse failed, fall through to legacy logic
             }
         }
@@ -1158,6 +1195,7 @@ export class ModelRouter {
                 apiKeyEnvName: 'MODAL_API_KEY',
             });
         }
+        logThought(`[Router] Final loaded models (${configModels.length}): ${configModels.map(m => `${m.id}->${m.model.split('/').pop()}`).join(', ')}`);
         return configModels;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twinclaw",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Eagle-eyed agentic AI gateway with multi-modal hooks and proactive memory.",
   "main": "dist/index.js",
   "bin": {