create-loopengine 0.1.44 → 0.1.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-loopengine",
-  "version": "0.1.44",
+  "version": "0.1.46",
   "description": "Scaffold a new loopengine agent project — a runnable HTTP server with one example agent, in your own repo.",
   "license": "MIT",
   "type": "module",

package/template/adapters/http.ts

@@ -29,9 +29,10 @@
 // file's call — see AgentConfig.sessionIdFor and defaultSessionIdFor below.
 import { execFile } from 'node:child_process'
 import { randomUUID, timingSafeEqual } from 'node:crypto'
-import { existsSync } from 'node:fs'
+import { createReadStream, existsSync } from 'node:fs'
+import { stat } from 'node:fs/promises'
 import { createServer, type IncomingMessage, type ServerResponse } from 'node:http'
-import { join } from 'node:path'
+import { extname, join, resolve as resolvePath, sep } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import { promisify } from 'node:util'
 import { getEntry, listAgents, projectDir, registerAgent, updateAgent, type RegistryEntry } from '../agent-registry.js'
@@ -137,6 +138,7 @@ import {
 import { SkillGarden } from 'loopengine'
 import type { Decision, PendingApproval } from 'actauth'
 import type { LoopEvent } from 'loopengine'
+import { storageSigners } from 'loopengine'
 
 const sessions = createSessionStore()
 const checkpoints = createCheckpointStore()
@@ -2053,91 +2055,139 @@ async function respondAfterResolution(res: ServerResponse, finalCheckpoint: Turn
 // long as the click that requested it takes to resolve, not however
 // long a chat reply might sit around unopened).
 //
-// Deliberately generic, not tied to any one ability — any ability using
-// GCS storage can point a tool's own returned URL here instead of
-// signing itself, as long as it authenticates the same way
+// Deliberately generic on two axes, not tied to any one ability or
+// cloud provider: any ability can point a tool's own returned URL here
+// instead of signing itself, as long as it authenticates the same way
+// loopengine's own storageSigners.gcs already does
+// (GOOGLE_APPLICATION_CREDENTIALS_JSON, falling back to Application
+// Default Credentials) — that's the same logic
 // lp-product-ad-images'/lp-file-archiver's own buildGcsStorageClient
-// already do (GOOGLE_APPLICATION_CREDENTIALS_JSON, falling back to
-// Application Default Credentials) — this is that same logic,
-// centralized, rather than every GCS-backed ability duplicating it
-// (which they already do today for the *upload* side; this just does
-// the same for signing).
+// already duplicate for the *upload* side, centralized in loopengine
+// core for signing instead. `provider` picks which one of
+// loopengine's own storageSigners actually does the signing (only
+// `gcs` exists today) — adding S3/Azure/etc. later is a loopengine
+// core change, not something this scaffolded file needs to know about.
 //
 // Sits behind the same isAuthorized() Basic Auth gate every other route
 // on this server already requires (checked once, unconditionally,
 // before any routing below even runs) — not a separately public
 // endpoint. A browser that already loaded /playground has that same
 // origin's Basic Auth credentials cached, so a plain
-// <img src="/gcs-redirect?..."> or download link both just work with no
-// extra wiring; anything without those credentials gets the same 401
-// every other route already gives it.
-async function handleGcsRedirect(req: IncomingMessage, res: ServerResponse): Promise<void> {
+// <img src="/storage-redirect?..."> or download link both just work
+// with no extra wiring; anything without those credentials gets the
+// same 401 every other route already gives it.
+async function handleStorageRedirect(req: IncomingMessage, res: ServerResponse): Promise<void> {
   const url = new URL(req.url ?? '/', 'http://localhost')
+  const provider = url.searchParams.get('provider')
   const bucket = url.searchParams.get('bucket')
   const object = url.searchParams.get('object')
   const disposition = url.searchParams.get('disposition')
   const filename = url.searchParams.get('filename')
 
-  if (!bucket || !object) {
-    res.writeHead(400, { 'content-type': 'application/json' }).end(JSON.stringify({ error: 'gcs-redirect requires both bucket and object query params' }))
+  if (!provider || !bucket || !object) {
+    res.writeHead(400, { 'content-type': 'application/json' }).end(JSON.stringify({ error: 'storage-redirect requires provider, bucket, and object query params' }))
     return
   }
   if (disposition && disposition !== 'inline' && disposition !== 'attachment') {
     res.writeHead(400, { 'content-type': 'application/json' }).end(JSON.stringify({ error: `disposition must be "inline" or "attachment" — got "${disposition}"` }))
     return
   }
-
-  // Imported by a variable, not a string literal, so tsc treats this as
-  // Promise<any> instead of trying to resolve @google-cloud/storage's
-  // own types at compile time — same reasoning
-  // lp-product-ad-images'/lp-file-archiver's own saveImage/saveArchive
-  // already use, for the same reason: installing it is only required at
-  // runtime for a deployment that actually uses this route, not every
-  // scaffolded project.
-  const gcsModuleName = '@google-cloud/storage'
-  let gcs: any
-  try {
-    gcs = await import(gcsModuleName)
-  } catch {
-    res.writeHead(500, { 'content-type': 'application/json' }).end(
-      JSON.stringify({ error: 'gcs-redirect requires the @google-cloud/storage package — npm install @google-cloud/storage in your own project.' }),
+  const signer = storageSigners[provider]
+  if (!signer) {
+    res.writeHead(400, { 'content-type': 'application/json' }).end(
+      JSON.stringify({ error: `storage-redirect: unknown provider "${provider}" — supported: ${Object.keys(storageSigners).join(', ')}` }),
     )
     return
   }
 
-  let client: any
-  const credentialsJson = process.env.GOOGLE_APPLICATION_CREDENTIALS_JSON
-  if (credentialsJson) {
-    let credentials: { project_id?: string }
-    try {
-      credentials = JSON.parse(credentialsJson)
-    } catch {
-      res.writeHead(500, { 'content-type': 'application/json' }).end(
-        JSON.stringify({
-          error: 'GOOGLE_APPLICATION_CREDENTIALS_JSON is not valid JSON — paste the entire contents of the downloaded service-account key file, unedited.',
-        }),
-      )
-      return
-    }
-    client = new gcs.Storage({ credentials, projectId: credentials.project_id })
-  } else {
-    client = new gcs.Storage()
-  }
-
   try {
-    const file = client.bucket(bucket).file(object)
-    const expires = Date.now() + 5 * 60 * 1000
-    const signOptions: Record<string, unknown> = { action: 'read', expires }
-    if (disposition === 'attachment') {
-      signOptions.responseDisposition = `attachment; filename="${filename || object.split('/').pop()}"`
-    }
-    const [signedUrl] = await file.getSignedUrl(signOptions)
+    const signedUrl = await signer({ bucket, object, disposition: (disposition as 'inline' | 'attachment' | null) ?? undefined, filename: filename ?? undefined })
     res.writeHead(302, { location: signedUrl }).end()
   } catch (err) {
     res
       .writeHead(502, { 'content-type': 'application/json' })
-      .end(JSON.stringify({ error: `gcs-redirect: could not sign a URL for gs://${bucket}/${object}: ${err instanceof Error ? err.message : String(err)}` }))
+      .end(JSON.stringify({ error: `storage-redirect: could not sign a URL for ${provider}://${bucket}/${object}: ${err instanceof Error ? err.message : String(err)}` }))
+  }
+}
+
+const LOCAL_FILE_CONTENT_TYPES: Record<string, string> = {
+  '.png': 'image/png',
+  '.jpg': 'image/jpeg',
+  '.jpeg': 'image/jpeg',
+  '.webp': 'image/webp',
+  '.gif': 'image/gif',
+  '.zip': 'application/zip',
+  '.pdf': 'application/pdf',
+}
+
+// storage-redirect above only ever has a URL to redirect to *because*
+// the cloud provider already serves the bytes itself — AD_IMAGE_STORAGE=
+// local/ARCHIVE_STORAGE=local has no such external server at all, so
+// this route serves the bytes directly instead of redirecting anywhere,
+// giving local storage the same preview/download-button treatment
+// storage-redirect already gives gcs, instead of the bare filesystem
+// path a local ability result used to be stuck with (unopenable by
+// anything except direct server access).
+//
+// `path` is resolved against process.cwd() (this process's own working
+// directory — not this file's location, and not any one ability's own
+// AD_IMAGE_OUTPUT_DIR/ARCHIVE_OUTPUT_DIR specifically, since this route
+// has no idea which ability or env var produced the value it's given)
+// and then checked against that same root before anything is read —
+// this route is otherwise a generic "serve a file from this
+// deployment's own project directory," and skipping that check would
+// turn it into an arbitrary-file-read over HTTP. AD_IMAGE_OUTPUT_DIR/
+// ARCHIVE_OUTPUT_DIR left at their own defaults (a relative path) are
+// already under cwd, so this covers the common case with zero
+// configuration; a deployment pointing either at an absolute path
+// outside the project directory gets no preview/download URL for that
+// file at all — see generate_google_ad_images.ts's/create_zip_archive.ts's
+// own saveImage/saveArchive doc comments for that fallback.
+//
+// Same Basic Auth gate as every other route on this server — see
+// handleStorageRedirect's own doc comment for why that's what makes a
+// plain <img src="/local-file?..."> just work with no extra wiring.
+async function handleLocalFile(req: IncomingMessage, res: ServerResponse): Promise<void> {
+  const url = new URL(req.url ?? '/', 'http://localhost')
+  const relativePath = url.searchParams.get('path')
+  const disposition = url.searchParams.get('disposition')
+  const filename = url.searchParams.get('filename')
+
+  if (!relativePath) {
+    res.writeHead(400, { 'content-type': 'application/json' }).end(JSON.stringify({ error: 'local-file requires a path query param' }))
+    return
+  }
+  if (disposition && disposition !== 'inline' && disposition !== 'attachment') {
+    res.writeHead(400, { 'content-type': 'application/json' }).end(JSON.stringify({ error: `disposition must be "inline" or "attachment" — got "${disposition}"` }))
+    return
+  }
+
+  const root = process.cwd()
+  const resolved = resolvePath(root, relativePath)
+  if (resolved !== root && !resolved.startsWith(root + sep)) {
+    res.writeHead(403, { 'content-type': 'application/json' }).end(JSON.stringify({ error: 'local-file: path escapes this deployment\'s own project directory' }))
+    return
+  }
+
+  let stats: Awaited<ReturnType<typeof stat>>
+  try {
+    stats = await stat(resolved)
+  } catch {
+    res.writeHead(404, { 'content-type': 'application/json' }).end(JSON.stringify({ error: `local-file: no such file "${relativePath}"` }))
+    return
+  }
+  if (!stats.isFile()) {
+    res.writeHead(400, { 'content-type': 'application/json' }).end(JSON.stringify({ error: `local-file: "${relativePath}" is not a regular file` }))
+    return
   }
+
+  const contentType = LOCAL_FILE_CONTENT_TYPES[extname(resolved).toLowerCase()] ?? 'application/octet-stream'
+  const headers: Record<string, string> = { 'content-type': contentType, 'content-length': String(stats.size) }
+  if (disposition === 'attachment') {
+    headers['content-disposition'] = `attachment; filename="${filename || relativePath.split('/').pop()}"`
+  }
+  res.writeHead(200, headers)
+  createReadStream(resolved).pipe(res)
 }
 
 const server = createServer(async (req, res) => {
@@ -2586,8 +2636,13 @@ const server = createServer(async (req, res) => {
       return
     }
 
-    if (req.method === 'GET' && pathname === '/gcs-redirect') {
-      await handleGcsRedirect(req, res)
+    if (req.method === 'GET' && pathname === '/storage-redirect') {
+      await handleStorageRedirect(req, res)
+      return
+    }
+
+    if (req.method === 'GET' && pathname === '/local-file') {
+      await handleLocalFile(req, res)
       return
     }