sanook-cli 0.5.0 → 0.5.2

package/dist/tools/git.js

@@ -1,7 +1,11 @@
 import { tool } from 'ai';
 import { z } from 'zod';
 import { runGit } from '../git.js';
+import { agentCwd } from '../agentContext.js';
 const gitErr = (e) => `git error: ${e.message}`;
+// รัน git ใน cwd ของ agent (worktree ของ sub-agent ถ้ามี) — ไม่งั้น git_commit/status/diff ไปโดน MAIN repo
+// แทนที่ของ sub-agent ที่ isolate ไว้ (worktree isolation พัง / commit ผิด tree)
+const gitCwd = () => agentCwd();
 export const gitStatusTool = tool({
     description: 'ดู git status — ไฟล์ที่เปลี่ยน/staged/untracked + branch',
     inputSchema: z.object({
@@ -10,7 +14,7 @@ export const gitStatusTool = tool({
     execute: async ({ path }) => {
         try {
             const args = ['status', '--short', '--branch', ...(path ? ['--', path] : [])];
-            return (await runGit(args)).trim() || '(clean)';
+            return (await runGit(args, gitCwd())).trim() || '(clean)';
         }
         catch (e) {
             return gitErr(e);
@@ -26,7 +30,7 @@ export const gitDiffTool = tool({
     execute: async ({ staged, path }) => {
         try {
             const args = ['diff', ...(staged ? ['--staged'] : []), ...(path ? ['--', path] : [])];
-            const out = await runGit(args);
+            const out = await runGit(args, gitCwd());
             return out.length > 20000 ? `${out.slice(0, 20000)}\n... [diff ยาว, ตัด]` : out || '(no changes)';
         }
         catch (e) {
@@ -41,7 +45,7 @@ export const gitLogTool = tool({
     }),
     execute: async ({ count = 10 }) => {
         try {
-            return (await runGit(['log', '--oneline', '-n', String(Math.min(Math.max(count, 1), 50))])) || '(no commits)';
+            return (await runGit(['log', '--oneline', '-n', String(Math.min(Math.max(count, 1), 50))], gitCwd())) || '(no commits)';
         }
         catch (e) {
             return gitErr(e);
@@ -57,9 +61,10 @@ export const gitCommitTool = tool({
     }),
     execute: async ({ message, addAll }) => {
         try {
+            const cwd = gitCwd();
             if (addAll)
-                await runGit(['add', '-A']);
-            return (await runGit(['commit', '-m', message])).trim();
+                await runGit(['add', '-A'], cwd);
+            return (await runGit(['commit', '-m', message], cwd)).trim();
         }
         catch (e) {
             return gitErr(e);

package/dist/tools/homeassistant.js

@@ -0,0 +1,106 @@
+import { tool } from 'ai';
+import { z } from 'zod';
+import { readGatewayConfig, resolveHomeAssistantConfig } from '../gateway/config.js';
+import { homeAssistantApiUrl, homeAssistantAuthHeaders, readHomeAssistantJsonResponse } from '../gateway/homeassistant.js';
+const BLOCKED_DOMAINS = new Set(['shell_command', 'command_line', 'python_script', 'pyscript', 'hassio', 'rest_command']);
+const ENTITY_ID_RE = /^[a-z_][a-z0-9_]*\.[a-z0-9_]+$/;
+async function loadHaConfig() {
+    const config = resolveHomeAssistantConfig(await readGatewayConfig());
+    if (!config.token)
+        throw new Error('ยังไม่ได้ตั้ง Home Assistant — รัน: sanook gateway setup homeassistant หรือ set HASS_TOKEN');
+    return config;
+}
+async function haFetch(config, path, init = {}) {
+    const r = await fetch(homeAssistantApiUrl(config, path), {
+        ...init,
+        headers: {
+            ...homeAssistantAuthHeaders(config.token, init.method ? { 'content-type': 'application/json' } : {}),
+            ...(init.headers ?? {}),
+        },
+    });
+    return readHomeAssistantJsonResponse(r, 'Home Assistant API');
+}
+function validateEntityId(entityId) {
+    const clean = entityId.trim();
+    if (!ENTITY_ID_RE.test(clean))
+        throw new Error(`entity_id ไม่ปลอดภัย/ไม่ถูกต้อง: ${entityId}`);
+    return clean;
+}
+function stateSummary(state) {
+    const name = typeof state.attributes?.friendly_name === 'string' ? state.attributes.friendly_name : state.entity_id;
+    return `${state.entity_id}: ${state.state ?? '(unknown)'}${name && name !== state.entity_id ? ` (${name})` : ''}`;
+}
+export const haListEntitiesTool = tool({
+    description: 'Home Assistant: list entities/states. Requires HASS_TOKEN or gateway setup homeassistant.',
+    inputSchema: z.object({
+        domain: z.string().optional().describe('Filter by entity domain เช่น light, switch, climate, sensor'),
+        area: z.string().optional().describe('Simple friendly-name substring filter เช่น living room, kitchen'),
+        limit: z.number().int().positive().max(200).optional().describe('Maximum rows to return (default 80)'),
+    }),
+    execute: async ({ domain, area, limit }) => {
+        const config = await loadHaConfig();
+        const states = await haFetch(config, '/states');
+        const cleanDomain = domain?.trim();
+        const areaNeedle = area?.trim().toLowerCase();
+        const rows = states
+            .filter((s) => !cleanDomain || s.entity_id?.startsWith(`${cleanDomain}.`))
+            .filter((s) => !areaNeedle || String(s.attributes?.friendly_name ?? s.entity_id ?? '').toLowerCase().includes(areaNeedle))
+            .slice(0, limit ?? 80)
+            .map(stateSummary);
+        return rows.length ? rows.join('\n') : 'ไม่พบ Home Assistant entity ที่ตรงเงื่อนไข';
+    },
+});
+export const haGetStateTool = tool({
+    description: 'Home Assistant: get detailed state and attributes for one entity.',
+    inputSchema: z.object({
+        entity_id: z.string().describe('Entity id เช่น light.living_room'),
+    }),
+    execute: async ({ entity_id }) => {
+        const config = await loadHaConfig();
+        const entityId = validateEntityId(entity_id);
+        const state = await haFetch(config, `/states/${encodeURIComponent(entityId)}`);
+        return JSON.stringify(state, null, 2);
+    },
+});
+export const haListServicesTool = tool({
+    description: 'Home Assistant: list available service domains/actions, optionally filtered by domain.',
+    inputSchema: z.object({
+        domain: z.string().optional().describe('Filter by service domain เช่น light, climate, switch'),
+    }),
+    execute: async ({ domain }) => {
+        const config = await loadHaConfig();
+        const services = await haFetch(config, '/services');
+        const cleanDomain = domain?.trim();
+        const rows = services
+            .filter((entry) => !cleanDomain || entry.domain === cleanDomain)
+            .map((entry) => `${entry.domain}: ${Object.keys(entry.services ?? {}).sort().join(', ') || '(none)'}`);
+        return rows.length ? rows.join('\n') : 'ไม่พบ Home Assistant service ที่ตรงเงื่อนไข';
+    },
+});
+export const haCallServiceTool = tool({
+    description: 'Home Assistant: call a service to control a device. Blocks unsafe domains such as shell_command, command_line, python_script, pyscript, hassio, and rest_command.',
+    inputSchema: z.object({
+        domain: z.string().describe('Service domain เช่น light, switch, climate, cover, media_player, scene, script'),
+        service: z.string().describe('Service name เช่น turn_on, turn_off, toggle, set_temperature'),
+        entity_id: z.string().optional().describe('Optional target entity id เช่น light.living_room'),
+        data: z.record(z.unknown()).optional().describe('Additional JSON service data'),
+    }),
+    execute: async ({ domain, service, entity_id, data }) => {
+        const config = await loadHaConfig();
+        const cleanDomain = domain.trim();
+        const cleanService = service.trim();
+        if (!/^[a-z_][a-z0-9_]*$/.test(cleanDomain))
+            throw new Error(`domain ไม่ถูกต้อง: ${domain}`);
+        if (!/^[a-z_][a-z0-9_]*$/.test(cleanService))
+            throw new Error(`service ไม่ถูกต้อง: ${service}`);
+        if (BLOCKED_DOMAINS.has(cleanDomain))
+            return `⛔ blocked Home Assistant domain: ${cleanDomain}`;
+        const entityId = entity_id ? validateEntityId(entity_id) : undefined;
+        const body = { ...(data ?? {}), ...(entityId ? { entity_id: entityId } : {}) };
+        const result = await haFetch(config, `/services/${encodeURIComponent(cleanDomain)}/${encodeURIComponent(cleanService)}`, {
+            method: 'POST',
+            body: JSON.stringify(body),
+        });
+        return `OK Home Assistant ${cleanDomain}.${cleanService}${entityId ? ` ${entityId}` : ''} (${Array.isArray(result) ? result.length : 0} state update(s))`;
+    },
+});

package/dist/tools/index.js

@@ -11,6 +11,7 @@ import { scheduleTaskTool, listScheduledTool, cancelScheduledTool } from './sche
 import { taskTool, taskParallelTool, taskSpawnTool, taskCollectTool, taskCancelTool, taskStatusTool } from './task.js';
 import { diagnosticsTool } from './diagnostics.js';
 import { gitStatusTool, gitDiffTool, gitLogTool, gitCommitTool } from './git.js';
+import { haCallServiceTool, haGetStateTool, haListEntitiesTool, haListServicesTool } from './homeassistant.js';
 /** tool registry ที่ส่งให้ agent loop */
 export const tools = {
     read_file: readFileTool,
@@ -39,5 +40,9 @@ export const tools = {
     git_diff: gitDiffTool,
     git_log: gitLogTool,
     git_commit: gitCommitTool,
+    ha_list_entities: haListEntitiesTool,
+    ha_get_state: haGetStateTool,
+    ha_list_services: haListServicesTool,
+    ha_call_service: haCallServiceTool,
 };
 export { readFileTool, writeFileTool, editFileTool, listDirTool, globTool, grepTool, bashTool };

package/dist/tools/list.js

@@ -1,6 +1,7 @@
 import { tool } from 'ai';
 import { z } from 'zod';
-import { readdir } from 'node:fs/promises';
+import { readdir, stat } from 'node:fs/promises';
+import { join } from 'node:path';
 import { clamp, resolveAgentPath } from './util.js';
 import { checkReadPath } from './permission.js';
 export const listDirTool = tool({
@@ -15,11 +16,23 @@ export const listDirTool = tool({
             return `BLOCKED: ${guard.reason}`;
         try {
             const entries = await readdir(full, { withFileTypes: true });
-            const out = entries
-                .filter((e) => !e.name.startsWith('.') || e.name === '.env.example' || e.name === '.gitignore')
-                .map((e) => (e.isDirectory() ? `${e.name}/` : e.name))
-                .sort()
-                .join('\n');
+            const visible = [];
+            for (const e of entries) {
+                if (e.name.startsWith('.') && e.name !== '.env.example' && e.name !== '.gitignore')
+                    continue;
+                const entryPath = join(full, e.name);
+                const entryGuard = await checkReadPath(entryPath);
+                if (!entryGuard.ok)
+                    continue;
+                let isDirectory = e.isDirectory();
+                if (!isDirectory && e.isSymbolicLink()) {
+                    isDirectory = await stat(entryPath)
+                        .then((s) => s.isDirectory())
+                        .catch(() => false);
+                }
+                visible.push(isDirectory ? `${e.name}/` : e.name);
+            }
+            const out = visible.sort().join('\n');
             return clamp(out) || '(empty)';
         }
         catch (err) {