@redaksjon/protokoll 1.0.21 → 1.0.22-dev.20260227214704.08e3d54

package/dist/mcp/server-hono.js

@@ -8,26 +8,38 @@ import { StreamableHTTPTransport } from '@hono/mcp';
 import { cors } from 'hono/cors';
 import { streamSSE } from 'hono/streaming';
 import { bodyLimit } from 'hono/body-limit';
-import { createReadStream } from 'node:fs';
-import * as fs from 'node:fs/promises';
 import { join, isAbsolute, extname, basename, resolve, dirname } from 'node:path';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { ListRootsRequestSchema, ListToolsRequestSchema, CallToolRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, ListPromptsRequestSchema, GetPromptRequestSchema } from '@modelcontextprotocol/sdk/types.js';
 import * as Cardigantime from '@utilarium/cardigantime';
+import Logging from '@fjell/logging';
 import { z } from 'zod';
-import { f as getOutputDirectory, D as DEFAULT_CONFIG_FILE, s as setRoots, d as initializeServerConfig, j as getServerConfig, k as getContext, t as tools, h as handleToolCall, a as handleListResources, b as handleReadResource, g as getPrompts, c as getPrompt, l as createQuietLogger, e as getCachedRoots, m as setWorkerInstance } from '../configDiscovery.js';
+import { f as getOutputDirectory, j as getOutputStorage, D as DEFAULT_CONFIG_FILE, s as setRoots, d as initializeServerConfig, k as getServerConfig, l as getStorageConfig, m as getContext, n as createQuietLogger, t as tools, h as handleToolCall, a as handleListResources, b as handleReadResource, g as getPrompts, c as getPrompt, e as getCachedRoots, o as setWorkerInstance } from '../configDiscovery.js';
 import { tmpdir } from 'node:os';
+import * as fs from 'node:fs/promises';
 import { glob } from 'glob';
 import { Transcript, Weighting, Pipeline } from '@redaksjon/protokoll-engine';
 import { PklTranscript } from '@redaksjon/protokoll-format';
 import 'js-yaml';
+import 'node:fs';
 import 'node:url';
 import '@redaksjon/context';
 import 'winston';
 import 'crypto';
+import '@google-cloud/storage';
 
 const { findUploadedTranscripts, markTranscriptAsTranscribing, markTranscriptAsFailed } = Transcript;
 const WEIGHT_MODEL_FILENAME = ".protokoll-weight-model.json";
+async function materializeUploadedAudio(outputStorage, uploadPath) {
+  const fileName = uploadPath.split("/").pop() || "uploaded-audio.bin";
+  const tempPath = join(
+    tmpdir(),
+    `protokoll-worker-${Date.now()}-${Math.random().toString(36).slice(2)}-${fileName}`
+  );
+  const contents = await outputStorage.readFile(uploadPath);
+  await fs.writeFile(tempPath, contents);
+  return tempPath;
+}
 class TranscriptionWorker {
   isRunning = false;
   config;
@@ -150,6 +162,7 @@ class TranscriptionWorker {
    */
   async processNextTranscript(item) {
     this.stats.currentTask = `Processing ${item.uuid}`;
+    let localTempAudioPath = null;
     console.log(`
 📝 Processing transcript: ${item.uuid}`);
     console.log(`   Audio file: ${item.metadata.audioFile}`);
@@ -157,15 +170,35 @@ class TranscriptionWorker {
     try {
       await markTranscriptAsTranscribing(item.filePath);
       let audioFilePath = item.metadata.audioFile && isAbsolute(item.metadata.audioFile) ? item.metadata.audioFile : join(this.config.uploadDirectory, item.metadata.audioFile || "");
+      const outputStorage = this.config.outputStorage;
+      const isGcsOutput = outputStorage?.name === "gcs";
+      if (isGcsOutput && item.metadata.audioFile && !isAbsolute(item.metadata.audioFile)) {
+        const uploadObjectPath = join("uploads", item.metadata.audioFile).replace(/\\/g, "/");
+        localTempAudioPath = await materializeUploadedAudio(outputStorage, uploadObjectPath);
+        audioFilePath = localTempAudioPath;
+      }
       try {
         await fs.stat(audioFilePath);
       } catch {
         if (item.metadata.audioHash) {
-          const byHash = await glob(`${item.metadata.audioHash}.*`, { cwd: this.config.uploadDirectory, absolute: true });
-          if (byHash.length > 0) {
-            audioFilePath = byHash[0];
+          if (isGcsOutput && outputStorage) {
+            const uploadMatches = await outputStorage.listFiles("uploads", item.metadata.audioHash);
+            const byHash = uploadMatches.filter(
+              (candidate) => candidate.split("/").pop()?.startsWith(`${item.metadata.audioHash}.`)
+            );
+            if (byHash.length > 0) {
+              localTempAudioPath = await materializeUploadedAudio(outputStorage, byHash[0]);
+              audioFilePath = localTempAudioPath;
+            } else {
+              throw new Error(`Audio file not found and no object matching hash ${item.metadata.audioHash} in uploads`);
+            }
           } else {
-            throw new Error(`Audio file not found at ${audioFilePath} and no file matching hash ${item.metadata.audioHash} in uploads`);
+            const byHash = await glob(`${item.metadata.audioHash}.*`, { cwd: this.config.uploadDirectory, absolute: true });
+            if (byHash.length > 0) {
+              audioFilePath = byHash[0];
+            } else {
+              throw new Error(`Audio file not found at ${audioFilePath} and no file matching hash ${item.metadata.audioHash} in uploads`);
+            }
           }
         } else {
           throw new Error(`Audio file not found at ${audioFilePath} and no audioHash for fallback lookup`);
@@ -278,6 +311,10 @@ class TranscriptionWorker {
       console.error(`❌ Failed to process ${item.uuid}:`, errorMessage);
       await markTranscriptAsFailed(item.filePath, errorMessage);
       this.stats.currentTask = void 0;
+    } finally {
+      if (localTempAudioPath) {
+        await fs.rm(localTempAudioPath, { force: true });
+      }
     }
   }
   /**
@@ -319,6 +356,19 @@ class TranscriptionWorker {
 }
 
 const { createUploadTranscript, findTranscriptByUuid } = Transcript;
+function bootstrapHttpLogLevel() {
+  const debugFromCli = process.argv.includes("--debug");
+  const debugFromEnv = parseBooleanEnv(process.env.PROTOKOLL_DEBUG) === true;
+  configureHttpLogLevel(debugFromCli || debugFromEnv);
+}
+bootstrapHttpLogLevel();
+const rootLogger = Logging.getLogger("@redaksjon/protokoll-mcp").get("http");
+const sessionLogger = rootLogger.get("session");
+const requestLogger = rootLogger.get("request");
+const transportLogger = rootLogger.get("transport");
+const sseLogger = rootLogger.get("sse");
+const lifecycleLogger = rootLogger.get("lifecycle");
+const uploadLogger = rootLogger.get("upload");
 let startupConfig = {};
 const DEFAULT_MAX_AUDIO_SIZE = 1024 * 1024 * 1024;
 const DEFAULT_AUDIO_EXTENSIONS = ["mp3", "m4a", "wav", "webm", "mp4", "aac", "ogg", "flac"];
@@ -326,6 +376,97 @@ function parseBooleanEnv(value) {
   if (!value) return void 0;
   return value.toLowerCase() === "true";
 }
+function readNonEmptyString(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
+}
+function readEnvString(name) {
+  return readNonEmptyString(process.env[name]);
+}
+function buildEnvStorageConfig() {
+  const configuredBackend = readEnvString("PROTOKOLL_STORAGE_BACKEND");
+  const gcs = {
+    projectId: readEnvString("PROTOKOLL_STORAGE_GCS_PROJECT_ID"),
+    inputUri: readEnvString("PROTOKOLL_STORAGE_GCS_INPUT_URI"),
+    outputUri: readEnvString("PROTOKOLL_STORAGE_GCS_OUTPUT_URI"),
+    contextUri: readEnvString("PROTOKOLL_STORAGE_GCS_CONTEXT_URI"),
+    inputBucket: readEnvString("PROTOKOLL_STORAGE_GCS_INPUT_BUCKET"),
+    inputPrefix: readEnvString("PROTOKOLL_STORAGE_GCS_INPUT_PREFIX"),
+    outputBucket: readEnvString("PROTOKOLL_STORAGE_GCS_OUTPUT_BUCKET"),
+    outputPrefix: readEnvString("PROTOKOLL_STORAGE_GCS_OUTPUT_PREFIX"),
+    contextBucket: readEnvString("PROTOKOLL_STORAGE_GCS_CONTEXT_BUCKET"),
+    contextPrefix: readEnvString("PROTOKOLL_STORAGE_GCS_CONTEXT_PREFIX"),
+    credentialsFile: readEnvString("PROTOKOLL_STORAGE_GCS_CREDENTIALS_FILE")
+  };
+  const hasGcsValue = Object.values(gcs).some((value) => value !== void 0);
+  const backend = configuredBackend ?? (hasGcsValue ? "gcs" : void 0);
+  if (!backend) return void 0;
+  const storage = {};
+  if (backend) storage.backend = backend;
+  if (hasGcsValue) storage.gcs = gcs;
+  return storage;
+}
+function describeRawStorageConfig(config) {
+  const lines = [];
+  const rawStorage = config.storage;
+  if (!rawStorage || typeof rawStorage !== "object") {
+    lines.push("🗄️  Storage Backend:  filesystem (default)");
+    return lines;
+  }
+  const storage = rawStorage;
+  const backend = storage.backend === "gcs" ? "gcs" : "filesystem";
+  lines.push(`🗄️  Storage Backend:  ${backend}`);
+  if (backend !== "gcs") {
+    return lines;
+  }
+  const gcs = typeof storage.gcs === "object" && storage.gcs !== null ? storage.gcs : {};
+  const projectId = readNonEmptyString(gcs.projectId);
+  const inputBucket = readNonEmptyString(gcs.inputBucket);
+  const inputPrefix = readNonEmptyString(gcs.inputPrefix) ?? "";
+  const outputBucket = readNonEmptyString(gcs.outputBucket);
+  const outputPrefix = readNonEmptyString(gcs.outputPrefix) ?? "";
+  const contextBucket = readNonEmptyString(gcs.contextBucket);
+  const contextPrefix = readNonEmptyString(gcs.contextPrefix) ?? "";
+  const inputUri = readNonEmptyString(gcs.inputUri);
+  const outputUri = readNonEmptyString(gcs.outputUri);
+  const contextUri = readNonEmptyString(gcs.contextUri);
+  const credentialsFile = readNonEmptyString(gcs.credentialsFile);
+  if (projectId) lines.push(`☁️  GCP Project:      ${projectId}`);
+  if (inputBucket) lines.push(`📥 GCS Input:         ${inputBucket}/${inputPrefix}`);
+  else if (inputUri) lines.push(`📥 GCS Input URI:     ${inputUri}`);
+  if (outputBucket) lines.push(`📤 GCS Output:        ${outputBucket}/${outputPrefix}`);
+  else if (outputUri) lines.push(`📤 GCS Output URI:    ${outputUri}`);
+  if (contextBucket) lines.push(`📚 GCS Context:       ${contextBucket}/${contextPrefix}`);
+  else if (contextUri) lines.push(`📚 GCS Context URI:   ${contextUri}`);
+  lines.push(`🔐 GCS Credentials:   ${credentialsFile ?? "ADC/default environment"}`);
+  return lines;
+}
+function configureHttpLogLevel(debug) {
+  const packageName = "@redaksjon/protokoll-mcp";
+  const logLevel = debug ? "DEBUG" : "INFO";
+  let parsed = {};
+  const raw = process.env.LOGGING_CONFIG;
+  if (raw) {
+    try {
+      parsed = JSON.parse(raw);
+    } catch {
+      parsed = {};
+    }
+  }
+  const overrides = parsed.overrides || {};
+  const packageOverride = overrides[packageName] || {};
+  process.env.LOGGING_CONFIG = JSON.stringify({
+    logLevel: parsed.logLevel || "INFO",
+    logFormat: parsed.logFormat || "TEXT",
+    ...parsed,
+    overrides: {
+      ...overrides,
+      [packageName]: {
+        ...packageOverride,
+        logLevel
+      }
+    }
+  });
+}
 function parseCsvList(value) {
   return value.split(",").map((part) => part.trim()).filter(Boolean);
 }
@@ -368,7 +509,10 @@ data: ${notification}
       }
     }
   }
-  console.log(`🔔 Entity change notification sent for ${entityUri} (${notified} writer(s) notified)`);
+  rootLogger.info("entity.notification.sent", {
+    entityUri,
+    notifiedWriters: notified
+  });
 }
 async function sendEntityChangeNotifications(toolName, args) {
   if (!args) return;
@@ -388,7 +532,10 @@ async function sendEntityChangeNotifications(toolName, args) {
       await notifyEntityChanged(ref.entityType, ref.entityId);
     }
   } catch (err) {
-    console.warn(`sendEntityChangeNotifications: error for ${toolName}:`, err);
+    rootLogger.error("entity.notification.error", {
+      toolName,
+      error: err instanceof Error ? err.message : String(err)
+    });
   }
 }
 const SESSION_TIMEOUT = 60 * 60 * 1e3;
@@ -396,7 +543,7 @@ setInterval(() => {
   const now = Date.now();
   for (const [sessionId, session] of sessions.entries()) {
     if (now - session.lastActivity > SESSION_TIMEOUT) {
-      console.log(`Cleaning up inactive session: ${sessionId}`);
+      sessionLogger.info("cleanup.inactive_session", { sessionId });
       sessions.delete(sessionId);
     }
   }
@@ -433,7 +580,10 @@ function createMcpServer() {
     try {
       const result = await handleToolCall(name, args);
       sendEntityChangeNotifications(name, args).catch((err) => {
-        console.error("Failed to send entity change notifications:", err);
+        rootLogger.error("entity.notification.dispatch_error", {
+          toolName: name,
+          error: err instanceof Error ? err.message : String(err)
+        });
       });
       return {
         content: [{ type: "text", text: JSON.stringify(result, null, 2) }]
@@ -515,18 +665,18 @@ app.post(
         }, 400);
       }
       const outputDir = getOutputDirectory();
-      const uploadDir = join(outputDir, "uploads");
-      await fs.mkdir(uploadDir, { recursive: true });
+      const outputStorage = getOutputStorage();
+      await outputStorage.mkdir("uploads");
       const buffer = await file.arrayBuffer();
       const hash = createHash("sha256").update(Buffer.from(buffer)).digest("hex");
-      const uploadedPath = join(uploadDir, `${hash}.${ext}`);
-      await fs.writeFile(uploadedPath, Buffer.from(buffer));
+      const uploadObjectPath = `uploads/${hash}.${ext}`;
+      await outputStorage.writeFile(uploadObjectPath, Buffer.from(buffer));
       const rawTitle = body["title"];
       const rawProject = body["project"];
       const title = typeof rawTitle === "string" && rawTitle.trim() ? rawTitle.trim() : void 0;
       const project = typeof rawProject === "string" && rawProject.trim() ? rawProject.trim() : void 0;
       const { uuid } = await createUploadTranscript({
-        audioFile: basename(uploadedPath),
+        audioFile: basename(uploadObjectPath),
         // Store just the filename
         originalFilename: file.name,
         audioHash: hash,
@@ -534,8 +684,13 @@ app.post(
         title,
         project
       });
-      console.log(`
-📤 Audio uploaded: ${file.name} → ${uuid}`);
+      uploadLogger.info("audio.upload.complete", {
+        originalFilename: file.name,
+        transcriptUuid: uuid,
+        bytes: buffer.byteLength,
+        objectPath: uploadObjectPath,
+        storageBackend: outputStorage.name
+      });
       return c.json({
         success: true,
         uuid,
@@ -546,7 +701,9 @@ app.post(
         project: project ?? null
       });
     } catch (error) {
-      console.error("Upload error:", error);
+      uploadLogger.error("audio.upload.error", {
+        error: error instanceof Error ? error.message : String(error)
+      });
       return c.json({
         error: "Upload failed",
         details: error instanceof Error ? error.message : String(error)
@@ -558,7 +715,7 @@ app.get("/audio/:uuid", async (c) => {
   try {
     const uuid = c.req.param("uuid");
     const outputDir = getOutputDirectory();
-    const uploadDir = join(outputDir, "uploads");
+    const outputStorage = getOutputStorage();
     const filePath = await findTranscriptByUuid(uuid, [outputDir]);
     if (!filePath) {
       return c.json({ error: `Transcript not found for UUID: ${uuid}` }, 404);
@@ -569,20 +726,23 @@ app.get("/audio/:uuid", async (c) => {
     if (!metadata.audioHash) {
       return c.json({ error: "No audio file associated with this transcript" }, 404);
     }
-    const audioFiles = await glob(`${metadata.audioHash}.*`, { cwd: uploadDir, absolute: true });
+    const uploadedFiles = await outputStorage.listFiles("uploads", metadata.audioHash);
+    const audioFiles = uploadedFiles.filter((filePath2) => basename(filePath2).startsWith(`${metadata.audioHash}.`));
     if (audioFiles.length === 0) {
       return c.json({ error: "Audio file not found in uploads directory" }, 404);
     }
     const audioFile = audioFiles[0];
     const ext = extname(audioFile);
-    const stat = await fs.stat(audioFile);
+    const audioBuffer = await outputStorage.readFile(audioFile);
     c.header("Content-Type", getAudioMimeType(ext));
-    c.header("Content-Length", stat.size.toString());
+    c.header("Content-Length", audioBuffer.length.toString());
     c.header("Content-Disposition", `attachment; filename="${metadata.audioFile || `${uuid}${ext}`}"`);
-    const stream = createReadStream(audioFile);
-    return c.body(stream);
+    return c.body(audioBuffer);
   } catch (error) {
-    console.error("Download error:", error);
+    uploadLogger.error("audio.download.error", {
+      uuid: c.req.param("uuid"),
+      error: error instanceof Error ? error.message : String(error)
+    });
     return c.json({
       error: "Download failed",
       details: error instanceof Error ? error.message : String(error)
@@ -621,11 +781,20 @@ app.get("/health", async (c) => {
   }
 });
 app.post("/mcp", async (c) => {
+  const requestStartedAt = Date.now();
   const sessionIdHeader = c.req.header("mcp-session-id");
   const body = await c.req.text();
   let jsonRpcMessage;
   try {
     jsonRpcMessage = JSON.parse(body);
+    requestLogger.debug("request.parse_jsonrpc", {
+      method: "POST",
+      route: "/mcp",
+      sessionId: sessionIdHeader ?? null,
+      rpcMethod: jsonRpcMessage.method ?? null,
+      rpcId: jsonRpcMessage.id ?? null,
+      elapsedMs: Date.now() - requestStartedAt
+    });
   } catch {
     return c.json({
       jsonrpc: "2.0",
@@ -634,20 +803,11 @@ app.post("/mcp", async (c) => {
     }, 400);
   }
   const isInitialize = jsonRpcMessage.method === "initialize";
-  if (!sessionIdHeader && !isInitialize) {
-    return c.json({
-      jsonrpc: "2.0",
-      error: { code: -32e3, message: "Missing Mcp-Session-Id header" },
-      id: jsonRpcMessage.id || null
-    }, 400);
-  }
-  let session;
-  if (isInitialize) {
-    const newSessionId = randomUUID();
+  const createSession = async (sessionId) => {
     const server = createMcpServer();
     const transport = new StreamableHTTPTransport();
-    session = {
-      sessionId: newSessionId,
+    const newSession = {
+      sessionId,
       server,
       transport,
       initialized: false,
@@ -655,105 +815,187 @@ app.post("/mcp", async (c) => {
       subscriptions: /* @__PURE__ */ new Set(),
       sseWriters: /* @__PURE__ */ new Set()
     };
-    sessions.set(newSessionId, session);
+    sessions.set(sessionId, newSession);
+    sessionLogger.info("created", {
+      sessionId,
+      workspaceRoot: process.env.WORKSPACE_ROOT || process.cwd()
+    });
     const cardigantimeConfig = startupConfig;
     const resolvedConfigDirs = cardigantimeConfig.resolvedConfigDirs;
     const configRoot = Array.isArray(resolvedConfigDirs) && resolvedConfigDirs.length > 0 ? resolvedConfigDirs[0] : process.env.WORKSPACE_ROOT || process.cwd();
     const configPathDisplay = resolve(configRoot, DEFAULT_CONFIG_FILE);
-    const workspaceRoot = process.env.WORKSPACE_ROOT || process.cwd();
-    const initialRoots = [{
-      uri: `file://${workspaceRoot}`,
-      name: "Workspace"
-    }];
+    const startupResolvedConfigDirs = startupConfig.resolvedConfigDirs;
+    const rootCandidates = Array.isArray(startupResolvedConfigDirs) && startupResolvedConfigDirs.length > 0 ? startupResolvedConfigDirs : [process.env.WORKSPACE_ROOT || process.cwd()];
+    const workspaceRoot = rootCandidates[0];
+    const initialRoots = rootCandidates.map((rootPath, index) => ({
+      uri: `file://${rootPath}`,
+      name: index === 0 ? "Workspace" : `Workspace ${index + 1}`
+    }));
+    process.env.WORKSPACE_ROOT = workspaceRoot;
     setRoots(initialRoots);
     await initializeServerConfig(initialRoots, "remote");
     const serverConfig = getServerConfig();
+    const storageConfig = getStorageConfig();
     const context = getContext();
     const contextDirs = context?.getContextDirs?.() ?? serverConfig.configFile?.contextDirectories;
     const contextDirsDisplay = Array.isArray(contextDirs) && contextDirs.length > 0 ? contextDirs.join(", ") : "NONE";
-    console.log("\n=================================================================");
-    console.log("SESSION CREATED");
-    console.log("=================================================================");
-    console.log(`Session ID: ${newSessionId}`);
-    console.log(`Working Directory: ${workspaceRoot}`);
-    console.log(`Config File:       ${configPathDisplay}`);
-    console.log("\nCONFIGURATION LOADED:");
-    console.log("-----------------------------------------------------------------");
-    console.log(`📥 Input (Audio):     ${serverConfig.inputDirectory || "NOT SET"}`);
-    console.log(`📤 Output (Notes):    ${serverConfig.outputDirectory || "NOT SET"}`);
-    console.log(`✅ Processed (Done):  ${serverConfig.processedDirectory || "NOT SET"}`);
-    console.log(`📚 Context Dirs:      ${contextDirsDisplay}`);
-    console.log(`🤖 AI Model:          ${cardigantimeConfig.model || "default"}`);
-    console.log(`🎤 Transcribe Model:  ${cardigantimeConfig.transcriptionModel || "default"}`);
-    console.log(`🐛 Debug Mode:        ${cardigantimeConfig.debug ? "ON" : "OFF"}`);
-    console.log(`📢 Verbose Mode:      ${cardigantimeConfig.verbose ? "ON" : "OFF"}`);
-    console.log("=================================================================\n");
-    c.header("Mcp-Session-Id", newSessionId);
-    await session.server.connect(transport);
+    sessionLogger.info("configuration.loaded", {
+      sessionId,
+      workingDirectory: workspaceRoot,
+      configFile: configPathDisplay,
+      inputDirectory: serverConfig.inputDirectory || null,
+      outputDirectory: serverConfig.outputDirectory || null,
+      processedDirectory: serverConfig.processedDirectory || null,
+      contextDirectories: contextDirsDisplay,
+      storageBackend: storageConfig.backend,
+      model: cardigantimeConfig.model || "default",
+      transcriptionModel: cardigantimeConfig.transcriptionModel || "default",
+      debugMode: cardigantimeConfig.debug ? "ON" : "OFF",
+      verboseMode: cardigantimeConfig.verbose ? "ON" : "OFF"
+    });
+    if (storageConfig.backend === "gcs" && storageConfig.gcs) {
+      sessionLogger.info("configuration.gcs", {
+        sessionId,
+        projectId: storageConfig.gcs.projectId ?? process.env.GOOGLE_CLOUD_PROJECT ?? "default",
+        credentialsFile: storageConfig.gcs.credentialsFile ?? "ADC/default environment",
+        inputBucket: storageConfig.gcs.inputBucket ?? null,
+        inputPrefix: storageConfig.gcs.inputPrefix ?? null,
+        outputBucket: storageConfig.gcs.outputBucket ?? null,
+        outputPrefix: storageConfig.gcs.outputPrefix ?? null,
+        contextBucket: storageConfig.gcs.contextBucket ?? null,
+        contextPrefix: storageConfig.gcs.contextPrefix ?? null
+      });
+    }
+    await newSession.server.connect(transport);
+    return newSession;
+  };
+  let session;
+  if (isInitialize) {
+    const newSessionId = randomUUID();
+    session = await createSession(newSessionId);
   } else {
-    session = sessions.get(sessionIdHeader);
+    const requestedSessionId = sessionIdHeader?.trim() || randomUUID();
+    session = sessions.get(requestedSessionId);
     if (!session) {
-      return c.json({
-        jsonrpc: "2.0",
-        error: { code: -32e3, message: "Session not found" },
-        id: jsonRpcMessage.id || null
-      }, 404);
+      sessionLogger.warning("recovered.missing_session", {
+        requestedSessionId: sessionIdHeader ?? null,
+        rpcMethod: jsonRpcMessage.method ?? null,
+        rpcId: jsonRpcMessage.id ?? null
+      });
+      session = await createSession(requestedSessionId);
     }
     session.lastActivity = Date.now();
+    sessionLogger.debug("reused", { sessionId: session.sessionId });
   }
+  c.header("Mcp-Session-Id", session.sessionId);
   const isNotification = jsonRpcMessage.id === void 0 || jsonRpcMessage.id === null;
-  console.log("\n─────────────────────────────────────────────────────────────────");
-  console.log(`📨 Incoming ${isNotification ? "NOTIFICATION" : "REQUEST"}`);
-  console.log("─────────────────────────────────────────────────────────────────");
-  console.log(`Method:     ${jsonRpcMessage.method}`);
-  console.log(`ID:         ${jsonRpcMessage.id !== void 0 ? jsonRpcMessage.id : "(none - notification)"}`);
-  console.log(`Session:    ${sessionIdHeader || "(new session)"}`);
-  if (jsonRpcMessage.params && Object.keys(jsonRpcMessage.params).length > 0) {
-    console.log(`Parameters:`);
-    console.log(JSON.stringify(jsonRpcMessage.params, null, 2));
-  } else {
-    console.log(`Parameters: (none)`);
-  }
-  console.log("─────────────────────────────────────────────────────────────────");
+  requestLogger.info("incoming", {
+    method: "POST",
+    route: "/mcp",
+    sessionId: session.sessionId,
+    rpcMethod: jsonRpcMessage.method ?? null,
+    rpcId: jsonRpcMessage.id ?? null,
+    rpcType: isNotification ? "notification" : "request"
+  });
+  requestLogger.debug("incoming.params", {
+    sessionId: session.sessionId,
+    rpcMethod: jsonRpcMessage.method ?? null,
+    rpcId: jsonRpcMessage.id ?? null,
+    params: jsonRpcMessage.params ?? null
+  });
   if (isNotification) {
     switch (jsonRpcMessage.method) {
       case "notifications/initialized":
         session.initialized = true;
-        console.log("✅ Client initialized");
+        requestLogger.info("notification.initialized", {
+          sessionId: session.sessionId,
+          rpcMethod: jsonRpcMessage.method
+        });
         break;
       case "notifications/cancelled":
-        console.log("⚠️  Client cancelled request:", jsonRpcMessage.params);
+        requestLogger.info("notification.cancelled", {
+          sessionId: session.sessionId,
+          params: jsonRpcMessage.params ?? null
+        });
         break;
       default:
-        console.log("⚠️  Unknown notification:", jsonRpcMessage.method);
+        requestLogger.debug("notification.unknown", {
+          sessionId: session.sessionId,
+          rpcMethod: jsonRpcMessage.method
+        });
     }
-    console.log("📤 Response: 202 Accepted (notification)");
-    console.log("─────────────────────────────────────────────────────────────────\n");
+    requestLogger.info("complete", {
+      method: "POST",
+      route: "/mcp",
+      sessionId: session.sessionId,
+      rpcMethod: jsonRpcMessage.method ?? null,
+      rpcId: jsonRpcMessage.id ?? null,
+      status: 202,
+      elapsedMs: Date.now() - requestStartedAt
+    });
     return c.body(null, 202);
   }
   if (jsonRpcMessage.method === "resources/subscribe") {
     const uri = jsonRpcMessage.params?.uri;
     if (uri) {
       session.subscriptions.add(uri);
-      console.log(`
-📝 SUBSCRIPTION CREATED: ${uri} (session: ${session.sessionId})`);
-      console.log(`   Total subscriptions for session: ${session.subscriptions.size}
-`);
+      sessionLogger.info("subscription.created", {
+        sessionId: session.sessionId,
+        uri,
+        totalSubscriptions: session.subscriptions.size
+      });
     }
+    requestLogger.info("complete", {
+      method: "POST",
+      route: "/mcp",
+      sessionId: session.sessionId,
+      rpcMethod: jsonRpcMessage.method,
+      rpcId: jsonRpcMessage.id ?? null,
+      status: 200,
+      elapsedMs: Date.now() - requestStartedAt
+    });
     return c.json({ jsonrpc: "2.0", result: {}, id: jsonRpcMessage.id });
   }
   if (jsonRpcMessage.method === "resources/unsubscribe") {
     const uri = jsonRpcMessage.params?.uri;
     if (uri) {
       session.subscriptions.delete(uri);
-      console.log(`
-📝 SUBSCRIPTION REMOVED: ${uri} (session: ${session.sessionId})`);
-      console.log(`   Total subscriptions for session: ${session.subscriptions.size}
-`);
+      sessionLogger.info("subscription.removed", {
+        sessionId: session.sessionId,
+        uri,
+        totalSubscriptions: session.subscriptions.size
+      });
     }
+    requestLogger.info("complete", {
+      method: "POST",
+      route: "/mcp",
+      sessionId: session.sessionId,
+      rpcMethod: jsonRpcMessage.method,
+      rpcId: jsonRpcMessage.id ?? null,
+      status: 200,
+      elapsedMs: Date.now() - requestStartedAt
+    });
     return c.json({ jsonrpc: "2.0", result: {}, id: jsonRpcMessage.id });
   }
-  return session.transport.handleRequest(c);
+  transportLogger.debug("request.transport", {
+    method: "POST",
+    route: "/mcp",
+    sessionId: session.sessionId,
+    rpcMethod: jsonRpcMessage.method ?? null,
+    rpcId: jsonRpcMessage.id ?? null,
+    elapsedMs: Date.now() - requestStartedAt
+  });
+  const response = await session.transport.handleRequest(c);
+  requestLogger.info("complete", {
+    method: "POST",
+    route: "/mcp",
+    sessionId: session.sessionId,
+    rpcMethod: jsonRpcMessage.method ?? null,
+    rpcId: jsonRpcMessage.id ?? null,
+    status: response.status,
+    elapsedMs: Date.now() - requestStartedAt
+  });
+  return response;
 });
 app.get("/mcp", async (c) => {
   const sessionId = c.req.header("mcp-session-id");
@@ -784,7 +1026,7 @@ app.get("/mcp", async (c) => {
     stream.onAbort(() => {
       clearInterval(pingInterval);
       session.sseWriters.delete(writer);
-      console.log(`SSE client disconnected from session ${sessionId}`);
+      sseLogger.info("client.disconnected", { sessionId });
     });
     let keepAlive = true;
     while (keepAlive) {
@@ -807,7 +1049,7 @@ app.delete("/mcp", async (c) => {
     return c.text("Session not found", 404);
   }
   sessions.delete(sessionId);
-  console.log(`Session terminated: ${sessionId}`);
+  sessionLogger.info("terminated", { sessionId });
   return c.body(null, 200);
 });
 let transcriptionWorker = null;
@@ -875,8 +1117,10 @@ async function main() {
     composeModel: args.composeModel ?? process.env.PROTOKOLL_COMPOSE_MODEL,
     transcriptionModel: args.transcriptionModel ?? process.env.PROTOKOLL_TRANSCRIPTION_MODEL,
     debug: args.debug ?? parseBooleanEnv(process.env.PROTOKOLL_DEBUG),
-    verbose: args.verbose ?? parseBooleanEnv(process.env.PROTOKOLL_VERBOSE)
+    verbose: args.verbose ?? parseBooleanEnv(process.env.PROTOKOLL_VERBOSE),
+    storage: buildEnvStorageConfig()
   });
+  configureHttpLogLevel(cardigantimeConfig.debug === true);
   if (!args.config) {
     const resolvedConfigDirs = cardigantimeConfig.resolvedConfigDirs;
     process.env.WORKSPACE_ROOT = resolvedConfigDirs?.[0] ?? process.env.WORKSPACE_ROOT ?? process.cwd();
@@ -912,24 +1156,26 @@ async function main() {
   const outputDir = cardigantimeConfig.outputDirectory || "NOT SET";
   const contextDirs = cardigantimeConfig.contextDirectories;
   const contextDirsDisplay = Array.isArray(contextDirs) && contextDirs.length > 0 ? contextDirs.join(", ") : "NOT SET";
-  console.log("\n=================================================================");
-  console.log("PROTOKOLL MCP HTTP SERVER (Hono)");
-  console.log("=================================================================");
-  console.log(`🌐 Server URL:        http://${host}:${port} ${portSource}`);
-  console.log(`💚 Health Check:      http://${host}:${port}/health`);
-  console.log(`🔌 MCP Endpoint:      http://${host}:${port}/mcp`);
-  console.log(`📁 Working Directory: ${process.cwd()}`);
-  console.log(`⚙️  Config File:       ${configPathDisplay}`);
-  console.log("\nCONFIGURATION:");
-  console.log("-----------------------------------------------------------------");
-  console.log(`📥 Input (Audio):     ${inputDir}`);
-  console.log(`📤 Output (Notes):    ${outputDir}`);
-  console.log(`📚 Context Dirs:      ${contextDirsDisplay}`);
-  console.log(`🤖 AI Model:          ${cardigantimeConfig.model || "default"}`);
-  console.log(`🎤 Transcribe Model:  ${cardigantimeConfig.transcriptionModel || "default"}`);
-  console.log(`🐛 Debug Mode:        ${cardigantimeConfig.debug ? "ON" : "OFF"}`);
-  console.log(`📢 Verbose Mode:      ${cardigantimeConfig.verbose ? "ON" : "OFF"}`);
-  console.log("=================================================================\n");
+  lifecycleLogger.info("startup", {
+    serverName: "protokoll-mcp-http",
+    transport: "hono",
+    serverUrl: `http://${host}:${port}`,
+    healthEndpoint: `http://${host}:${port}/health`,
+    mcpEndpoint: `http://${host}:${port}/mcp`,
+    portSource,
+    workingDirectory: process.cwd(),
+    configFile: configPathDisplay,
+    inputDirectory: inputDir,
+    outputDirectory: outputDir,
+    contextDirectories: contextDirsDisplay,
+    model: cardigantimeConfig.model || "default",
+    transcriptionModel: cardigantimeConfig.transcriptionModel || "default",
+    debugMode: cardigantimeConfig.debug ? "ON" : "OFF",
+    verboseMode: cardigantimeConfig.verbose ? "ON" : "OFF"
+  });
+  lifecycleLogger.debug("startup.storage", {
+    lines: describeRawStorageConfig(cardigantimeConfig)
+  });
   if (outputDir !== "NOT SET") {
     const uploadDirectory = join(outputDir, "uploads");
     transcriptionWorker = new TranscriptionWorker({
@@ -939,6 +1185,7 @@ async function main() {
       // uses the same entity store as the rest of the server (not guessed from CWD).
       contextDirectories: Array.isArray(contextDirs) && contextDirs.length > 0 ? contextDirs : void 0,
       uploadDirectory,
+      outputStorage: getOutputStorage(),
       scanInterval: 5e3,
       // 5 second scan interval
       model: cardigantimeConfig.model,
@@ -947,17 +1194,19 @@ async function main() {
     await transcriptionWorker.start();
     setWorkerInstance(transcriptionWorker);
   } else {
-    console.log("⚠️  Output directory not configured - transcription worker disabled");
+    lifecycleLogger.info("worker.disabled", {
+      reason: "output_directory_not_configured"
+    });
   }
   process.on("SIGTERM", async () => {
-    console.log("\n🛑 Received SIGTERM, shutting down gracefully...");
+    lifecycleLogger.info("shutdown.signal_received", { signal: "SIGTERM" });
     if (transcriptionWorker) {
       await transcriptionWorker.stop();
     }
     process.exit(0);
   });
   process.on("SIGINT", async () => {
-    console.log("\n🛑 Received SIGINT, shutting down gracefully...");
+    lifecycleLogger.info("shutdown.signal_received", { signal: "SIGINT" });
     if (transcriptionWorker) {
       await transcriptionWorker.stop();
     }
@@ -970,7 +1219,9 @@ async function main() {
   });
 }
 main().catch((error) => {
-  console.error("Failed to start server:", error);
+  lifecycleLogger.error("startup.failed", {
+    error: error instanceof Error ? error.message : String(error)
+  });
   process.exit(1);
 });