@leg3ndy/otto-bridge 0.2.0 → 0.3.0

package/README.md

@@ -31,7 +31,7 @@ Enquanto o pacote nao estiver publicado, voce pode gerar um tarball local:
 
 ```bash
 npm pack
-npm install -g ./leg3ndy-otto-bridge-0.2.0.tgz
+npm install -g ./leg3ndy-otto-bridge-0.3.0.tgz
 ```
 
 ## Publicacao

package/dist/executors/native_macos.js

@@ -5,8 +5,10 @@ const KNOWN_APPS = [
     { canonical: "Safari", patterns: [/\bsafari\b/i] },
     { canonical: "Google Chrome", patterns: [/\bgoogle chrome\b/i, /\bchrome\b/i] },
     { canonical: "Firefox", patterns: [/\bfirefox\b/i] },
+    { canonical: "Spotify", patterns: [/\bspotify\b/i, /\bspofity\b/i] },
     { canonical: "Finder", patterns: [/\bfinder\b/i] },
     { canonical: "Notes", patterns: [/\bnotes\b/i, /\bnotas\b/i] },
+    { canonical: "TextEdit", patterns: [/\btextedit\b/i, /\bbloco de notas\b/i, /\beditor de texto\b/i] },
     { canonical: "Mail", patterns: [/\bmail\b/i] },
     { canonical: "Messages", patterns: [/\bmessages\b/i, /\bmensagens\b/i] },
     { canonical: "Calendar", patterns: [/\bcalendar\b/i, /\bcalend[áa]rio\b/i] },
@@ -15,6 +17,7 @@ const KNOWN_APPS = [
 ];
 const KNOWN_SITES = [
     { url: "https://www.youtube.com", patterns: [/\byoutube\b/i, /\byou tube\b/i] },
+    { url: "https://www.instagram.com", patterns: [/\binstagram\b/i, /\binstagram\.com\b/i] },
     { url: "https://mail.google.com", patterns: [/\bgmail\b/i] },
     { url: "https://www.google.com", patterns: [/\bgoogle\b/i] },
     { url: "https://github.com", patterns: [/\bgithub\b/i] },
@@ -65,6 +68,49 @@ function normalizeUrl(raw) {
     }
     return `https://${trimmed.replace(/^\/+/, "")}`;
 }
+function splitTextForTyping(value) {
+    const parts = [];
+    for (const line of value.split("\n")) {
+        if (line.length <= 220) {
+            parts.push(line);
+            continue;
+        }
+        for (let index = 0; index < line.length; index += 220) {
+            parts.push(line.slice(index, index + 220));
+        }
+    }
+    return parts;
+}
+function extractConfirmationOptions(job, actions) {
+    const payload = asRecord(job.payload);
+    const requested = payload.requires_confirmation === true;
+    const longTyping = actions.some((action) => action.type === "type_text" && action.text.trim().length >= 180);
+    const confirmationMessage = asString(payload.confirmation_message)
+        || `O Otto quer executar ${actions.length} ação${actions.length === 1 ? "" : "ões"} no seu Mac.`;
+    return {
+        required: requested || longTyping,
+        message: confirmationMessage,
+    };
+}
+function parseShortcut(shortcut) {
+    const parts = shortcut
+        .split("+")
+        .map((part) => part.trim().toLowerCase())
+        .filter(Boolean);
+    const key = parts.pop() || "";
+    const modifiers = parts.map((part) => {
+        if (part === "cmd" || part === "command")
+            return "command down";
+        if (part === "shift")
+            return "shift down";
+        if (part === "alt" || part === "option")
+            return "option down";
+        if (part === "ctrl" || part === "control")
+            return "control down";
+        return "";
+    }).filter(Boolean);
+    return { key, modifiers };
+}
 function detectKnownApp(task) {
     for (const app of KNOWN_APPS) {
         if (app.patterns.some((pattern) => pattern.test(task))) {
@@ -99,7 +145,7 @@ function parseStructuredActions(job) {
         if (type === "open_app" || type === "focus_app") {
             const app = asString(action.app) || asString(action.application) || asString(action.name);
             if (app) {
-                actions.push({ type: "open_app", app });
+                actions.push({ type, app });
             }
             continue;
         }
@@ -109,6 +155,20 @@ function parseStructuredActions(job) {
             if (url) {
                 actions.push({ type: "open_url", url: normalizeUrl(url), app: app || undefined });
             }
+            continue;
+        }
+        if (type === "type_text" || type === "write_text" || type === "keystroke") {
+            const text = asString(action.text) || asString(action.content);
+            if (text) {
+                actions.push({ type: "type_text", text });
+            }
+            continue;
+        }
+        if (type === "press_shortcut" || type === "shortcut") {
+            const shortcut = asString(action.shortcut) || asString(action.keys);
+            if (shortcut) {
+                actions.push({ type: "press_shortcut", shortcut });
+            }
         }
     }
     return actions;
@@ -151,6 +211,16 @@ export class NativeMacOSJobExecutor {
             throw new Error("Otto Bridge native-macos could not derive a supported local action from this request");
         }
         await reporter.accepted();
+        const confirmation = extractConfirmationOptions(job, actions);
+        if (confirmation.required) {
+            const decision = await reporter.confirmRequired(confirmation.message, {
+                actions,
+                executor: "native-macos",
+            });
+            if (decision.action !== "approve") {
+                throw new JobCancelledError(job.job_id);
+            }
+        }
         try {
             for (let index = 0; index < actions.length; index += 1) {
                 this.assertNotCancelled(job.job_id);
@@ -161,6 +231,21 @@ export class NativeMacOSJobExecutor {
                     await this.openApp(action.app);
                     continue;
                 }
+                if (action.type === "focus_app") {
+                    await reporter.progress(progressPercent, `Trazendo ${action.app} para frente`);
+                    await this.focusApp(action.app);
+                    continue;
+                }
+                if (action.type === "press_shortcut") {
+                    await reporter.progress(progressPercent, `Enviando atalho ${action.shortcut}`);
+                    await this.pressShortcut(action.shortcut);
+                    continue;
+                }
+                if (action.type === "type_text") {
+                    await reporter.progress(progressPercent, "Digitando texto no app ativo");
+                    await this.typeText(action.text);
+                    continue;
+                }
                 await reporter.progress(progressPercent, `Abrindo ${action.url}${action.app ? ` em ${action.app}` : ""}`);
                 await this.openUrl(action.url, action.app);
             }
@@ -191,20 +276,80 @@ export class NativeMacOSJobExecutor {
     }
     async openApp(app) {
         await this.runCommand("open", ["-a", app]);
-        await this.runCommand("osascript", ["-e", `tell application "${escapeAppleScript(app)}" to activate`]);
+        await this.focusApp(app);
     }
     async openUrl(url, app) {
         if (app) {
             await this.runCommand("open", ["-a", app, url]);
-            await this.runCommand("osascript", ["-e", `tell application "${escapeAppleScript(app)}" to activate`]);
+            await this.focusApp(app);
             return;
         }
         await this.runCommand("open", [url]);
     }
+    async focusApp(app) {
+        await this.runCommand("osascript", ["-e", `tell application "${escapeAppleScript(app)}" to activate`]);
+    }
+    async pressShortcut(shortcut) {
+        const { key, modifiers } = parseShortcut(shortcut);
+        if (!key) {
+            throw new Error(`Invalid shortcut: ${shortcut}`);
+        }
+        const namedKeyCodes = {
+            return: 36,
+            enter: 36,
+            tab: 48,
+            space: 49,
+            escape: 53,
+            esc: 53,
+            left: 123,
+            right: 124,
+            down: 125,
+            up: 126,
+        };
+        const usingClause = modifiers.length > 0 ? ` using {${modifiers.join(", ")}}` : "";
+        if (namedKeyCodes[key] !== undefined) {
+            await this.runCommand("osascript", [
+                "-e",
+                `tell application "System Events" to key code ${namedKeyCodes[key]}${usingClause}`,
+            ]);
+            return;
+        }
+        await this.runCommand("osascript", [
+            "-e",
+            `tell application "System Events" to keystroke "${escapeAppleScript(key)}"${usingClause}`,
+        ]);
+    }
+    async typeText(text) {
+        const chunks = splitTextForTyping(text);
+        for (let index = 0; index < chunks.length; index += 1) {
+            const chunk = chunks[index];
+            if (chunk) {
+                await this.runCommand("osascript", [
+                    "-e",
+                    `tell application "System Events" to keystroke "${escapeAppleScript(chunk)}"`,
+                ]);
+            }
+            if (index < chunks.length - 1) {
+                await this.runCommand("osascript", [
+                    "-e",
+                    'tell application "System Events" to key code 36',
+                ]);
+            }
+        }
+    }
     describeAction(action) {
         if (action.type === "open_app") {
             return `${action.app} foi aberto no macOS`;
         }
+        if (action.type === "focus_app") {
+            return `${action.app} ficou em foco no macOS`;
+        }
+        if (action.type === "press_shortcut") {
+            return `Atalho ${action.shortcut} executado no macOS`;
+        }
+        if (action.type === "type_text") {
+            return "Texto digitado no aplicativo ativo";
+        }
         return `${action.url} foi aberto${action.app ? ` em ${action.app}` : ""}`;
     }
     async runCommand(command, args) {

package/dist/types.js

@@ -1,5 +1,5 @@
 export const BRIDGE_CONFIG_VERSION = 1;
-export const BRIDGE_VERSION = "0.2.0";
+export const BRIDGE_VERSION = "0.3.0";
 export const BRIDGE_PACKAGE_NAME = "@leg3ndy/otto-bridge";
 export const DEFAULT_API_BASE_URL = "http://localhost:8000";
 export const DEFAULT_POLL_INTERVAL_MS = 3000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leg3ndy/otto-bridge",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "private": false,
   "type": "module",
   "description": "Local companion for Otto Bridge device pairing and WebSocket runtime.",