@kuratchi/js 0.0.22 → 0.0.23

package/dist/compiler/index.js

@@ -136,7 +136,7 @@ export async function compile(options) {
     // Auto-discover convention-based worker class files (no config needed)
     const containerConfig = discoverContainerFiles(projectDir);
     const workflowConfig = discoverWorkflowFiles(projectDir);
-    const agentConfig = discoverConventionClassFiles(projectDir, path.join('src', 'server'), '.agent.ts', '.agent');
+    const agentConfig = discoverConventionClassFiles(projectDir, path.join('src', 'server'), '.agents.ts', '.agents');
     // Generate handler proxy modules in .kuratchi/do/ (must happen BEFORE route processing
     // so that $durable-objects/X imports can be redirected to the generated proxies)
     const doProxyDir = path.join(projectDir, '.kuratchi', 'do');
@@ -301,12 +301,18 @@ export async function compile(options) {
     // routes.ts already exports the default fetch handler and all named DO classes;
     // worker.ts explicitly re-exports them so wrangler.jsonc can reference a
     // stable filename while routes.ts is freely regenerated.
+    // If user has src/index.ts with a default export, merge it with the generated worker
+    // to support scheduled, queue, and other Cloudflare Worker handlers.
+    const userIndexFile = path.join(srcDir, 'index.ts');
+    const hasUserIndex = fs.existsSync(userIndexFile) &&
+        fs.readFileSync(userIndexFile, 'utf-8').includes('export default');
     const workerFile = path.join(outDir, 'worker.ts');
     writeIfChanged(workerFile, buildWorkerEntrypointSource({
         projectDir,
         outDir,
         doClassNames: doConfig.map((entry) => entry.className),
         workerClassEntries: [...agentConfig, ...containerConfig, ...workflowConfig],
+        hasUserIndex,
     }));
     writeIfChanged(path.join(outDir, 'worker.js'), buildCompatEntrypointSource('./worker.ts'));
     // Auto-sync wrangler.jsonc with workflow/container/DO config from kuratchi.config.ts
@@ -323,12 +329,17 @@ export async function compile(options) {
         copyDirIfChanged(srcAssetsDir, publicAssetsDir);
         syncedAssetsDirectory = path.relative(projectDir, publicDir).replace(/\\/g, '/');
     }
+    // Convert agent config to DO config format (agents are Durable Objects)
+    const agentDoConfig = agentConfig.map((entry) => {
+        const binding = entry.className.replace(/([a-z])([A-Z])/g, '$1_$2').toUpperCase();
+        return { binding, className: entry.className };
+    });
     syncWranglerConfigPipeline({
         projectDir,
         config: {
             workflows: workflowConfig,
             containers: containerConfig,
-            durableObjects: doConfig,
+            durableObjects: [...doConfig, ...agentDoConfig],
             assetsDirectory: syncedAssetsDirectory,
         },
         writeFile: writeIfChanged,

package/dist/compiler/worker-output-pipeline.d.ts

@@ -10,5 +10,6 @@ export declare function buildWorkerEntrypointSource(opts: {
     outDir: string;
     doClassNames: string[];
     workerClassEntries: WorkerClassExportEntry[];
+    hasUserIndex?: boolean;
 }): string;
 export declare function buildCompatEntrypointSource(targetFile: string): string;

package/dist/compiler/worker-output-pipeline.js

@@ -29,13 +29,18 @@ export function buildWorkerEntrypointSource(opts) {
         }
         return `export { ${entry.className} } from '${importPath}';`;
     });
-    return [
+    const lines = [
         '// Auto-generated by kuratchi — do not edit.',
-        "export { default } from './routes.ts';",
-        ...opts.doClassNames.map((className) => `export { ${className} } from './routes.ts';`),
-        ...workerClassExports,
-        '',
-    ].join('\n');
+    ];
+    // If user has src/index.ts with a default export, merge it with the generated fetch handler
+    if (opts.hasUserIndex) {
+        lines.push("import __generatedWorker from './routes.ts';", "import __userWorker from '../src/index.ts';", '', '// Merge user worker exports (scheduled, queue, etc.) with generated fetch handler', 'export default {', '  ...__userWorker,', '  fetch: __generatedWorker.fetch,', '};');
+    }
+    else {
+        lines.push("export { default } from './routes.ts';");
+    }
+    lines.push(...opts.doClassNames.map((className) => `export { ${className} } from './routes.ts';`), ...workerClassExports, '');
+    return lines.join('\n');
 }
 export function buildCompatEntrypointSource(targetFile) {
     return [

package/dist/runtime/generated-worker.js

@@ -392,14 +392,22 @@ function __attachCookies(response) {
     const csrfCookie = getCsrfCookieHeader();
     const hasCookies = (cookies && cookies.length > 0) || csrfCookie;
     if (hasCookies) {
-        const newResponse = new Response(response.body, response);
+        // Clone the response properly to avoid body stream issues with WARP/proxy layers.
+        // Using response.clone() ensures the body stream is properly duplicated.
+        const cloned = response.clone();
+        const newHeaders = new Headers(cloned.headers);
         if (cookies) {
             for (const header of cookies)
-                newResponse.headers.append('Set-Cookie', header);
+                newHeaders.append('Set-Cookie', header);
         }
         if (csrfCookie) {
-            newResponse.headers.append('Set-Cookie', csrfCookie);
+            newHeaders.append('Set-Cookie', csrfCookie);
         }
+        const newResponse = new Response(cloned.body, {
+            status: cloned.status,
+            statusText: cloned.statusText,
+            headers: newHeaders,
+        });
         return __secHeaders(newResponse);
     }
     return __secHeaders(response);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kuratchi/js",
-    "version": "0.0.22",
+    "version": "0.0.23",
     "description": "A thin, Cloudflare Workers-native web framework with Svelte-inspired syntax",
     "license": "MIT",
     "type": "module",