create-wirejs-app 2.0.171 → 2.0.173

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-wirejs-app",
-	"version": "2.0.171",
+	"version": "2.0.173",
 	"description": "Initializes a wirejs package.",
 	"author": "Jon Wire",
 	"license": "MIT",

package/templates/default/api/apps/llm/tooled-handler.ts

@@ -1,4 +1,4 @@
-import type { ToolCall } from 'wirejs-resources';
+import type { ToolCall, ToolMessage } from 'wirejs-resources';
 import { Infra } from './infra.js'
 import { cleanTitle } from './utils.js';
 import { generateConversationTitle } from './prompts.js';
@@ -58,6 +58,7 @@ export const tooledHandler = (infra: Infra) => async (
 			history.push(response);
 
 			toolCalls = tools && tools.length > 0 ? response.tool_calls ?? [] : [];
+			const toolMessage: ToolMessage = { role: 'tool', content: [] };
 			for (const call of toolCalls) {
 				const name = call.function.name;
 				const args = call.function.arguments;
@@ -82,22 +83,24 @@ export const tooledHandler = (infra: Infra) => async (
 
 					// makes tool results visible in the conversation history
 					// to the agent.
-					history.push(await infra.addMessage(room, mid++, {
-						role: 'tool',
-						tool_name: name,
-						tool_call_id: call.id || JSON.stringify([name, args]),
+					toolMessage.content.push({
+						id: call.id || JSON.stringify([name, args]),
 						content: JSON.stringify(r, null, 2),
-					}));
+						isError: false,
+					})
 				} catch (error) {
-					history.push(await infra.addMessage(room, mid++, {
-						role: 'tool',
-						tool_name: name,
-						tool_call_id: call.id || JSON.stringify([name, args]),
+					toolMessage.content.push({
+						id: call.id || JSON.stringify([name, args]),
 						content: String(error),
-					}))
+						isError: true,
+					})
 				}
 			}
 
+			if (toolCalls.length > 0) {
+				history.push(await infra.addMessage(room, mid++, toolMessage));
+			}
+
 			maxLoops--;
 		} while (toolCalls.length > 0);
 

package/templates/default/api/index.ts

@@ -1,4 +1,4 @@
-import { AuthenticationService, Endpoint } from 'wirejs-resources';
+import { AuthenticationService, Endpoint, GoogleOIDCProvider } from 'wirejs-resources';
 import { Chat } from './apps/chat.js';
 import { Todos } from './apps/todos.js';
 import { Wiki } from './apps/wiki.js';
@@ -11,7 +11,9 @@ export type * from './apps/todos.js';
 export type * from './apps/store.js';
 export type * from './apps/admin.js';
 
-const authService = new AuthenticationService('app', 'core-users');
+const authService = new AuthenticationService('app', 'core-users', {
+	oidcProviders: [ GoogleOIDCProvider ]
+});
 
 export const auth = authService.buildApi();
 export const chat = Chat(auth);

package/templates/default/package.json

@@ -11,15 +11,15 @@
 	"dependencies": {
 		"dompurify": "^3.2.3",
 		"marked": "^15.0.6",
+		"wirejs-components": "^0.1.111",
 		"wirejs-dom": "^1.0.44",
-		"wirejs-resources": "^0.1.166",
-		"wirejs-components": "^0.1.109",
-		"wirejs-module-payments-stripe": "^0.1.60",
-		"wirejs-web-worker": "^1.0.63"
+		"wirejs-module-payments-stripe": "^0.1.62",
+		"wirejs-resources": "^0.1.168",
+		"wirejs-web-worker": "^1.0.65"
 	},
 	"devDependencies": {
-		"wirejs-scripts": "^3.0.164",
-		"typescript": "^5.7.3"
+		"typescript": "^5.7.3",
+		"wirejs-scripts": "^3.0.166"
 	},
 	"scripts": {
 		"prebuild": "npm run prebuild --workspaces --if-present",

package/templates/default/src/layouts/main.ts

@@ -12,7 +12,7 @@ const DISCLAIMER = html`<div>
 
 async function Account() {
 	return html`<div id='${MENU_ID}'>
-		${AccountMenu({ api: auth })}
+		${await AccountMenu({ api: auth })}
 	</div>`;
 }
 

package/templates/default/src/ssg/admin.ts

@@ -1,4 +1,5 @@
 import { html, list, node, text, hydrate } from 'wirejs-dom/v2';
+import { AuthenticatedContent } from 'wirejs-components';
 import { Main } from '../layouts/main.js';
 import { admin, Endpoint, Setting, SystemAttribute } from 'internal-api';
 
@@ -154,14 +155,15 @@ function Admin() {
 
 async function App() {
 	const self = html`<div id='app'>
-	${node('isAdmin', false, (isAdmin: boolean | undefined) => 
-		isAdmin ?
-			html`<div><p>Your <b>are</b> an admin.</p>${Admin()}</div>`
-			: html`<p>You are <b>NOT</b> an admin.</p>`
-	)}
-	</div>`.onadd(async self => {
-		self.data.isAdmin = await admin.isAdmin(null);
-	});
+		${await AuthenticatedContent({
+			authenticated: async () => {
+				return (await admin.isAdmin(null)) ?
+					html`<div><p>Your <b>are</b> an admin.</p>${Admin()}</div>`
+					: html`<p>You are <b>NOT</b> an admin.</p>`
+			},
+			unauthenticated: () => html`<p>You are not signed in.</p>`,
+		})}
+	</div>`;
 	return self;
 }