khal-os 1.260324.13 → 1.260324.14

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "khal-os",
-	"version": "1.260324.13",
+	"version": "1.260324.14",
 	"scripts": {
 		"dev": "next dev --port 8888",
 		"build": "NEXT_PRIVATE_BUILD_WORKER=false next build",

package/packages/genie-app/views/genie/service/agent-lifecycle.ts

@@ -58,14 +58,14 @@ export const agentLifecycleHandlers: ServiceHandler[] = [
 		subject: SUBJECTS.agent.history(),
 		handler: (msg) => {
 			try {
-				const { name, full, since } = msg.json<{ name: string; full?: boolean; since?: string }>();
+				const { name, full, since } = msg.json<{ name: string; full?: boolean; since?: number }>();
 				if (!name) {
 					msg.respond(JSON.stringify({ error: 'Missing required field: name' }));
 					return;
 				}
 				const args = ['history', name, '--json'];
 				if (full) args.push('--full');
-				if (since) args.push('--since', since);
+				if (since !== undefined) args.push('--since', String(since));
 
 				const result = runGenie<unknown[]>(args, { timeout: 15_000 });
 				if (!result.ok) {

package/packages/genie-app/views/genie/service/comms.ts

@@ -45,14 +45,14 @@ export const commsHandlers: ServiceHandler[] = [
 		subject: SUBJECTS.comms.broadcast(),
 		handler: (msg) => {
 			try {
-				const req = msg.json<{ body: string; team?: string }>();
+				const req = msg.json<{ body: string; from?: string }>();
 				if (!req.body) {
 					msg.respond(JSON.stringify({ error: 'Missing required field: body' }));
 					return;
 				}
 
 				const args = ['broadcast', req.body];
-				if (req.team) args.push('--team', req.team);
+				if (req.from) args.push('--from', req.from);
 
 				const result = runGenie(args, { json: false });
 				if (!result.ok) {

package/packages/genie-app/views/genie/service/directory.ts

@@ -14,7 +14,9 @@ interface DirAddPayload {
 	dir?: string;
 	repo?: string;
 	model?: string;
+	promptMode?: string;
 	roles?: string[];
+	global?: boolean;
 }
 
 interface DirRemovePayload {
@@ -26,8 +28,9 @@ interface DirEditPayload {
 	model?: string;
 	dir?: string;
 	repo?: string;
+	promptMode?: string;
 	roles?: string[];
-	description?: string;
+	global?: boolean;
 }
 
 export const directorySubscriptions = [
@@ -80,7 +83,7 @@ export const directorySubscriptions = [
 		subject: SUBJECTS.dir.add(),
 		handler: (msg: { data: Uint8Array; json: <T>() => T; respond: (data: string) => void }) => {
 			try {
-				const { name, dir, repo, model, roles } = msg.json<DirAddPayload>();
+				const { name, dir, repo, model, promptMode, roles, global: isGlobal } = msg.json<DirAddPayload>();
 				if (!name) {
 					msg.respond(JSON.stringify({ error: 'name is required' }));
 					return;
@@ -90,11 +93,9 @@ export const directorySubscriptions = [
 				if (dir) args.push('--dir', dir);
 				if (repo) args.push('--repo', repo);
 				if (model) args.push('--model', model);
-				if (roles) {
-					for (const role of roles) {
-						args.push('--role', role);
-					}
-				}
+				if (promptMode) args.push('--prompt-mode', promptMode);
+				if (roles?.length) args.push('--roles', ...roles);
+				if (isGlobal) args.push('--global');
 
 				const result = runGenie(args, { json: false });
 				if (!result.ok) {
@@ -136,7 +137,7 @@ export const directorySubscriptions = [
 		subject: SUBJECTS.dir.edit(),
 		handler: (msg: { data: Uint8Array; json: <T>() => T; respond: (data: string) => void }) => {
 			try {
-				const { name, model, dir, repo, roles, description } = msg.json<DirEditPayload>();
+				const { name, model, dir, repo, promptMode, roles, global: isGlobal } = msg.json<DirEditPayload>();
 				if (!name) {
 					msg.respond(JSON.stringify({ error: 'name is required' }));
 					return;
@@ -146,12 +147,9 @@ export const directorySubscriptions = [
 				if (model) args.push('--model', model);
 				if (dir) args.push('--dir', dir);
 				if (repo) args.push('--repo', repo);
-				if (description) args.push('--description', description);
-				if (roles) {
-					for (const role of roles) {
-						args.push('--role', role);
-					}
-				}
+				if (promptMode) args.push('--prompt-mode', promptMode);
+				if (roles?.length) args.push('--roles', ...roles);
+				if (isGlobal) args.push('--global');
 
 				const result = runGenie(args, { json: false });
 				if (!result.ok) {

package/packages/genie-app/views/genie/service/index.ts

@@ -2,6 +2,7 @@ import type { NatsConnection } from '@khal-os/sdk/service';
 import { createService } from '@khal-os/sdk/service';
 import { agentLifecycleHandlers } from './agent-lifecycle';
 import { appsHandlers } from './apps';
+import { runGenieAsync } from './cli';
 import { commsHandlers } from './comms';
 import { directorySubscriptions } from './directory';
 import { systemSubscriptions } from './system';
@@ -133,18 +134,49 @@ createService({
 		// --- Spawn agent ---
 		{
 			subject: 'os.genie.spawn',
-			handler: (msg) => {
+			handler: async (msg) => {
 				try {
-					const { execSync } = require('node:child_process');
-					const req = msg.json<{ role: string; team?: string; repo?: string }>();
-					const args = [req.role];
+					const req = msg.json<{
+						role: string;
+						team?: string;
+						repo?: string;
+						provider?: string;
+						model?: string;
+						skill?: string;
+						layout?: string;
+						color?: string;
+						planMode?: boolean;
+						permissionMode?: string;
+						cwd?: string;
+						session?: string;
+					}>();
+					if (!req.role) {
+						msg.respond(JSON.stringify({ ok: false, error: 'Missing required field: role' }));
+						return;
+					}
+
+					const args = ['spawn', req.role];
 					if (req.team) args.push('--team', req.team);
-					const result = execSync(`genie spawn ${args.join(' ')}`, {
+					if (req.provider) args.push('--provider', req.provider);
+					if (req.model) args.push('--model', req.model);
+					if (req.skill) args.push('--skill', req.skill);
+					if (req.layout) args.push('--layout', req.layout);
+					if (req.color) args.push('--color', req.color);
+					if (req.planMode) args.push('--plan-mode');
+					if (req.permissionMode) args.push('--permission-mode', req.permissionMode);
+					if (req.cwd) args.push('--cwd', req.cwd);
+					if (req.session) args.push('--session', req.session);
+
+					const result = await runGenieAsync(args, {
+						json: false,
+						timeout: 15_000,
 						cwd: req.repo || process.env.HOME,
-						timeout: 15000,
-						encoding: 'utf-8',
 					});
-					msg.respond(JSON.stringify({ ok: true, output: result.trim() }));
+					if (!result.ok) {
+						msg.respond(JSON.stringify({ ok: false, error: result.error }));
+						return;
+					}
+					msg.respond(JSON.stringify({ ok: true, output: result.data }));
 				} catch (err) {
 					msg.respond(JSON.stringify({ ok: false, error: String(err) }));
 				}

package/packages/genie-app/views/genie/service/teams.ts

@@ -57,7 +57,7 @@ export const teamsHandlers: ServiceHandler[] = [
 		subject: SUBJECTS.teams.create(),
 		handler: async (msg) => {
 			try {
-				const req = msg.json<{ name: string; repo: string; branch?: string; wish?: string }>();
+				const req = msg.json<{ name: string; repo: string; branch?: string; wish?: string; session?: string }>();
 				if (!req.name || !req.repo) {
 					msg.respond(JSON.stringify({ ok: false, error: 'Missing required fields: name, repo' }));
 					return;
@@ -66,6 +66,7 @@ export const teamsHandlers: ServiceHandler[] = [
 				const args = ['team', 'create', req.name, '--repo', req.repo];
 				if (req.branch) args.push('--branch', req.branch);
 				if (req.wish) args.push('--wish', req.wish);
+				if (req.session) args.push('--session', req.session);
 
 				const result = await runGenieAsync(args, { json: false, timeout: 120_000 });
 				if (!result.ok) {

package/packages/genie-app/views/genie/ui/hooks/useNatsRequest.ts

@@ -29,10 +29,16 @@ export function useNatsRequest<T = unknown>(
 	const intervalRef = useRef<ReturnType<typeof setInterval> | null>(null);
 	const mountedRef = useRef(true);
 
+	// Stabilize payload by serializing — prevents infinite re-render loops
+	// when callers pass inline objects like { name: teamName }
+	const payloadKey = JSON.stringify(payload ?? null);
+	const payloadRef = useRef(payload);
+	payloadRef.current = payload;
+
 	const fetchData = useCallback(async () => {
 		try {
 			const client = getNatsClient();
-			const response = await client.request(subject, payload ?? {}, 5000);
+			const response = await client.request(subject, payloadRef.current ?? {}, 5000);
 			if (!mountedRef.current) return;
 			setData(response as T);
 			setError(null);
@@ -44,7 +50,7 @@ export function useNatsRequest<T = unknown>(
 				setLoading(false);
 			}
 		}
-	}, [subject, payload]);
+	}, [subject, payloadKey]);
 
 	useEffect(() => {
 		mountedRef.current = true;