Merge develop for v1.0.1 release

# Conflicts:
#	src/version.ts

Author: ConalMullan

.github/workflows/deploy-dev.yml

@@ -60,6 +60,9 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -71,6 +74,25 @@ jobs:
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
+      - name: Calculate commits ahead of latest tag
+        id: commits
+        run: |
+          # Get the latest tag by date (works even if tag is on different branch)
+          LATEST_TAG=$(git tag --sort=-creatordate | head -1)
+          if [ -n "$LATEST_TAG" ]; then
+            # Find merge base between tag and HEAD, then count commits since
+            MERGE_BASE=$(git merge-base $LATEST_TAG HEAD 2>/dev/null || echo "")
+            if [ -n "$MERGE_BASE" ]; then
+              COMMITS_AHEAD=$(git rev-list ${MERGE_BASE}..HEAD --count)
+            else
+              COMMITS_AHEAD=0
+            fi
+          else
+            COMMITS_AHEAD=0
+          fi
+          echo "ahead=$COMMITS_AHEAD" >> $GITHUB_OUTPUT
+          echo "Latest tag: $LATEST_TAG, Merge base: $MERGE_BASE, Commits ahead: $COMMITS_AHEAD"
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
@@ -80,6 +102,11 @@ jobs:
           tags: |
             ${{ secrets.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
             ${{ secrets.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          build-args: |
+            GIT_COMMIT=${{ github.sha }}
+            GIT_REF=${{ github.ref_name }}
+            BUILD_TIME=${{ github.event.head_commit.timestamp }}
+            COMMITS_AHEAD=${{ steps.commits.outputs.ahead }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 

.github/workflows/deploy-prod.yml

@@ -59,6 +59,9 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -94,6 +97,10 @@ jobs:
             ${{ secrets.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }}
             ${{ secrets.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
             ${{ secrets.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:production
+          build-args: |
+            GIT_COMMIT=${{ github.sha }}
+            GIT_REF=${{ github.ref_name }}
+            BUILD_TIME=${{ github.event.head_commit.timestamp }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
@@ -129,11 +136,14 @@ jobs:
             # Update docker-compose to use production tag
             sed -i 's/:latest/:production/g' docker-compose.yml
 
+            # Set production network name (apps3 uses deployment_proxy)
+            export PROXY_NETWORK=deployment_proxy
+
             # Stop and remove old container
-            sudo docker compose down --remove-orphans || true
+            sudo PROXY_NETWORK=$PROXY_NETWORK docker compose down --remove-orphans || true
 
             # Start new container
-            sudo docker compose up -d
+            sudo PROXY_NETWORK=$PROXY_NETWORK docker compose up -d
 
             # Wait for service to be healthy
             echo "Waiting for service to be healthy..."
@@ -175,3 +185,13 @@ jobs:
           echo "| **Version** | ${{ steps.version.outputs.version }} |" >> $GITHUB_STEP_SUMMARY
           echo "| **Commit** | ${{ github.sha }} |" >> $GITHUB_STEP_SUMMARY
           echo "| **Triggered by** | ${{ github.actor }} |" >> $GITHUB_STEP_SUMMARY
+
+      - name: Sync develop branch with main
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git fetch origin develop
+          git checkout develop
+          git merge main --no-edit -m "chore: sync develop with main after ${{ steps.version.outputs.version }} release"
+          git push origin develop
+          echo "✅ Develop branch synced with main" >> $GITHUB_STEP_SUMMARY

Dockerfile

@@ -11,6 +11,12 @@
 
 FROM node:20-alpine AS builder
 
+# Build arguments for version info
+ARG GIT_COMMIT=unknown
+ARG GIT_REF=unknown
+ARG BUILD_TIME=unknown
+ARG COMMITS_AHEAD=0
+
 WORKDIR /app
 
 # Copy package files
@@ -22,6 +28,9 @@ RUN npm ci
 # Copy source
 COPY . .
 
+# Generate version info file
+RUN echo "{\"commit\":\"${GIT_COMMIT}\",\"ref\":\"${GIT_REF}\",\"buildTime\":\"${BUILD_TIME}\",\"commitsAhead\":${COMMITS_AHEAD}}" > version.json
+
 # Build TypeScript
 RUN npm run build
 
@@ -36,9 +45,10 @@ COPY package*.json ./
 # Install production dependencies only
 RUN npm ci --omit=dev && npm cache clean --force
 
-# Copy built files
+# Copy built files and version info
 COPY --from=builder /app/dist ./dist
 COPY --from=builder /app/bin ./bin
+COPY --from=builder /app/version.json ./version.json
 
 # Set environment variables
 ENV NODE_ENV=production

deployment/docker-compose.yml

@@ -1,4 +1,4 @@
-# Digital Samba MCP Server - Development Deployment
+# Digital Samba MCP Server - Deployment
 #
 # This is the production-ready docker-compose for deployment.
 # Images are pulled from the private registry.
@@ -9,6 +9,11 @@
 # Requires:
 #   - .env file with configuration
 #   - nginx-proxy network (external)
+#
+# Environment Variables:
+#   - PROXY_NETWORK: External network name (default: proxy)
+#     - Dev (apps4): proxy
+#     - Prod (apps3): deployment_proxy
 
 services:
   mcp-server:
@@ -63,6 +68,7 @@ volumes:
 
 networks:
   proxy:
+    name: ${PROXY_NETWORK:-proxy}
     external: true
   internal:
     driver: bridge

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalsamba/embedded-api-mcp-server",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.1",
   "packageManager": "npm@10.2.0",
   "description": "Digital Samba Embedded API MCP Server - Model Context Protocol server for Digital Samba's Embedded API",
   "type": "module",

scripts/inject-version.js

@@ -3,6 +3,9 @@
 /**
  * Inject version information into the build
  * This script generates a version file that can be imported at runtime
+ *
+ * In Docker builds, version.json is generated with git info.
+ * This script reads that file and generates the appropriate exports.
  */
 
 import fs from 'fs';
@@ -16,25 +19,73 @@ const __dirname = path.dirname(__filename);
 const packagePath = path.join(__dirname, '..', 'package.json');
 const packageData = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
 
+// Try to read version.json (generated during Docker build)
+let gitInfo = { commit: 'dev', ref: 'local', buildTime: new Date().toISOString(), commitsAhead: 0 };
+const versionJsonPath = path.join(__dirname, '..', 'version.json');
+if (fs.existsSync(versionJsonPath)) {
+  try {
+    gitInfo = JSON.parse(fs.readFileSync(versionJsonPath, 'utf8'));
+  } catch {
+    // Ignore errors, use defaults
+  }
+}
+
 // Create version info object
 const versionInfo = {
   version: packageData.version,
   name: packageData.name,
-  buildTime: new Date().toISOString(),
+  commit: gitInfo.commit,
+  ref: gitInfo.ref,
+  buildTime: gitInfo.buildTime,
+  commitsAhead: gitInfo.commitsAhead || 0,
   nodeVersion: process.version
 };
 
-// Generate version file content
+// Generate version file content with all exports
 const versionFileContent = `/**
  * Auto-generated version information
  * DO NOT EDIT - This file is automatically generated during build
  */
 
 export const VERSION_INFO = ${JSON.stringify(versionInfo, null, 2)};
 
-export const VERSION = '${packageData.version}';
-export const PACKAGE_NAME = '${packageData.name}';
+export const VERSION = '${versionInfo.version}';
+export const PACKAGE_NAME = '${versionInfo.name}';
 export const BUILD_TIME = '${versionInfo.buildTime}';
+export const GIT_COMMIT = '${versionInfo.commit}';
+export const GIT_REF = '${versionInfo.ref}';
+export const COMMITS_AHEAD = ${versionInfo.commitsAhead};
+
+/**
+ * Get a formatted version string for display
+ * Examples:
+ * - Production (on tag): "1.0.0"
+ * - Development: "1.0.0-rc.1 (e5f1b19)"
+ */
+export function getDisplayVersion() {
+  // If ref is a tag or commit is dev/unknown, just show version
+  if (
+    GIT_REF.startsWith('v') ||
+    GIT_COMMIT === 'dev' ||
+    GIT_COMMIT === 'unknown'
+  ) {
+    return VERSION;
+  }
+  // Otherwise show version with commit
+  return \`\${VERSION} (\${GIT_COMMIT.substring(0, 7)})\`;
+}
+
+/**
+ * Check if this is a development build
+ */
+export function isDevBuild() {
+  return (
+    BUILD_TIME === 'development' ||
+    GIT_REF === 'develop' ||
+    GIT_REF.includes('dev') ||
+    GIT_REF === 'local'
+  );
+}
 `;
 
 // Ensure dist/src directory exists
@@ -55,19 +106,29 @@ const versionDtsContent = `/**
 export interface VersionInfo {
   version: string;
   name: string;
+  commit: string;
+  ref: string;
   buildTime: string;
+  commitsAhead: number;
   nodeVersion: string;
 }
 
 export declare const VERSION_INFO: VersionInfo;
 export declare const VERSION: string;
 export declare const PACKAGE_NAME: string;
 export declare const BUILD_TIME: string;
+export declare const GIT_COMMIT: string;
+export declare const GIT_REF: string;
+export declare const COMMITS_AHEAD: number;
+export declare function getDisplayVersion(): string;
+export declare function isDevBuild(): boolean;
 `;
 
 const versionDtsPath = path.join(distSrcPath, 'version.d.ts');
 fs.writeFileSync(versionDtsPath, versionDtsContent);
 
 console.log(`✅ Version ${packageData.version} injected into build`);
 console.log(`   - Version file: ${versionFilePath}`);
-console.log(`   - Build time: ${versionInfo.buildTime}`);
+console.log(`   - Build time: ${versionInfo.buildTime}`);
+console.log(`   - Git commit: ${versionInfo.commit}`);
+console.log(`   - Git ref: ${versionInfo.ref}`);

src/server.ts

@@ -90,7 +90,15 @@ import {
   executeExportTool,
 } from "./tools/export-tools/index.js";
 
-import { VERSION, VERSION_INFO } from "./version.js";
+import {
+  VERSION,
+  VERSION_INFO,
+  GIT_COMMIT,
+  GIT_REF,
+  COMMITS_AHEAD,
+  getDisplayVersion,
+  isDevBuild,
+} from "./version.js";
 
 // API client instance cache - keyed by apiKey:apiUrl to support different URLs per session
 let apiClientCache: Map<string, DigitalSambaApiClient> = new Map();
@@ -290,13 +298,18 @@ export function createServer(config: ServerConfig = {}): Server {
         name === "hard-delete-session-resources" ||
         name === "bulk-delete-session-data" ||
         name === "get-session-statistics" ||
+        name === "get-session-statistics-details" ||
         name === "list-sessions" ||
         name === "get-session-details" ||
         name === "list-session-participants" ||
         name === "list-room-sessions"
       ) {
         return await executeSessionTool(name, args || {}, client, request);
       }
+      // Export tools (check BEFORE recording tools - export-recording-metadata contains "recording")
+      else if (name.includes("export-")) {
+        return await executeExportTool(name, args || {}, request, { apiUrl });
+      }
       // Recording management tools
       else if (
         name.includes("recording") ||
@@ -315,16 +328,14 @@ export function createServer(config: ServerConfig = {}): Server {
       ) {
         return await executeLiveSessionTool(name, args || {}, client);
       }
-      // Export tools
-      else if (name.includes("export-")) {
-        return await executeExportTool(name, args || {}, request, { apiUrl });
-      }
       // Communication management tools
       else if (
         name.includes("-chats") ||
         name.includes("-qa") ||
         name.includes("-transcripts") ||
-        name.includes("-summaries")
+        name.includes("-summaries") ||
+        name === "delete-session-recordings" ||
+        name === "delete-session-resources"
       ) {
         return await executeCommunicationTool(name, args || {}, client);
       }
@@ -379,4 +390,12 @@ export function createServer(config: ServerConfig = {}): Server {
   return server;
 }
 
-export { VERSION, VERSION_INFO };
+export {
+  VERSION,
+  VERSION_INFO,
+  GIT_COMMIT,
+  GIT_REF,
+  COMMITS_AHEAD,
+  getDisplayVersion,
+  isDevBuild,
+};