pmx-canvas 0.1.11 → 0.1.13

package/src/server/diagram-presets.ts

@@ -135,8 +135,6 @@ function normalizeExcalidrawBoundText(elements: Array<Record<string, unknown>>):
 
   let changed = false;
   const boundElementIdsByContainer = new Map<string, Set<string>>();
-  const labelByContainer = new Map<string, Record<string, unknown>>();
-  const textIdsConvertedToLabels = new Set<string>();
 
   for (const element of elements) {
     if (element.type !== 'text' || typeof element.id !== 'string' || typeof element.containerId !== 'string') continue;
@@ -145,48 +143,28 @@ function normalizeExcalidrawBoundText(elements: Array<Record<string, unknown>>):
     const ids = boundElementIdsByContainer.get(element.containerId) ?? new Set<string>();
     ids.add(element.id);
     boundElementIdsByContainer.set(element.containerId, ids);
-    const text = typeof element.text === 'string' ? element.text.trim() : '';
-    if (!isRecord(container.label) && text.length > 0) {
-      labelByContainer.set(element.containerId, {
-        text,
-        ...(typeof element.fontSize === 'number' && Number.isFinite(element.fontSize) ? { fontSize: element.fontSize } : {}),
-      });
-      textIdsConvertedToLabels.add(element.id);
-    }
   }
 
-  const normalized = elements.flatMap<Record<string, unknown>>((element) => {
-    if (typeof element.id === 'string' && textIdsConvertedToLabels.has(element.id)) {
-      changed = true;
-      return [];
-    }
+  const normalized = elements.map((element) => {
     if (typeof element.id !== 'string') return element;
     const boundTextIds = boundElementIdsByContainer.get(element.id);
-    const label = labelByContainer.get(element.id);
-    if ((!boundTextIds || boundTextIds.size === 0) && !label) return element;
+    if (!boundTextIds || boundTextIds.size === 0) return element;
 
     const existing = Array.isArray(element.boundElements)
       ? element.boundElements.filter(isRecord)
       : [];
-    const remainingExisting = existing.filter((boundElement) => {
-      return !(boundElement.type === 'text' && typeof boundElement.id === 'string' && textIdsConvertedToLabels.has(boundElement.id));
-    });
     const existingTextIds = new Set(
-      remainingExisting
+      existing
         .filter((boundElement) => boundElement.type === 'text' && typeof boundElement.id === 'string')
         .map((boundElement) => boundElement.id as string),
     );
-    const missing = [...(boundTextIds ?? [])]
-      .filter((id) => !textIdsConvertedToLabels.has(id) && !existingTextIds.has(id));
-    if (missing.length === 0 && !label && remainingExisting.length === existing.length) return element;
+    const missing = [...boundTextIds].filter((id) => !existingTextIds.has(id));
+    if (missing.length === 0) return element;
 
     changed = true;
     return {
       ...element,
-      ...(label ? { label } : {}),
-      ...(remainingExisting.length > 0 || missing.length > 0
-        ? { boundElements: [...remainingExisting, ...missing.map((id) => ({ type: 'text', id }))] }
-        : {}),
+      boundElements: [...existing, ...missing.map((id) => ({ type: 'text', id }))],
     };
   });
 

package/src/server/index.ts

@@ -97,7 +97,7 @@ export class PmxCanvas extends EventEmitter {
     open?: boolean;
     automationWebView?: boolean | CanvasAutomationWebViewOptions;
   }): Promise<void> {
-    const base = startCanvasServer({ port: this._port });
+    const base = startCanvasServer({ port: this._port, allowPortFallback: false });
     if (!base) {
       throw new Error(`Failed to start canvas server on port ${this._port}`);
     }
@@ -605,7 +605,7 @@ export class PmxCanvas extends EventEmitter {
   async startAutomationWebView(
     options: CanvasAutomationWebViewOptions = {},
   ): Promise<CanvasAutomationWebViewStatus> {
-    const base = this._server ?? startCanvasServer({ port: this._port });
+    const base = this._server ?? startCanvasServer({ port: this._port, allowPortFallback: false });
     if (!base) {
       throw new Error(`Failed to start canvas server on port ${this._port}`);
     }

package/src/server/server.ts

@@ -1639,6 +1639,7 @@ async function handleCanvasBuildWebArtifact(req: Request): Promise<Response> {
       bytes: result.fileSize,
       projectPath: result.projectPath,
       openedInCanvas: result.openedInCanvas,
+      completedAt: result.completedAt,
       // `id` is the canvas node id alias used by every other add-style
       // response. It is only present when a canvas node was actually
       // created (i.e. openInCanvas was not explicitly disabled). When
@@ -3727,6 +3728,7 @@ export interface CanvasServerOptions {
   port?: number;
   workspaceRoot?: string;
   autoOpenBrowser?: boolean;
+  allowPortFallback?: boolean;
 }
 
 export function startCanvasServer(options: CanvasServerOptions = {}): string | null {
@@ -3764,7 +3766,9 @@ export function startCanvasServer(options: CanvasServerOptions = {}): string | n
   rotatePrimaryWorkbenchSessionIfNeeded();
 
   const preferredPort = options.port ?? Number(process.env.PMX_WEB_CANVAS_PORT ?? DEFAULT_PORT);
-  const portCandidates = buildPortCandidates(preferredPort);
+  const portCandidates = options.allowPortFallback === false
+    ? [preferredPort > 0 ? Math.floor(preferredPort) : DEFAULT_PORT]
+    : buildPortCandidates(preferredPort);
 
   for (const portCandidate of portCandidates) {
     try {

package/src/server/web-artifacts/scripts/init-artifact.sh

@@ -116,12 +116,13 @@ else
   echo "✅ Using Vite $VITE_VERSION (Node 18 compatible)"
 fi
 
-# Detect OS and set sed syntax
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  SED_INPLACE="sed -i ''"
-else
-  SED_INPLACE="sed -i"
-fi
+function sed_in_place() {
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+    sed -i '' "$@"
+  else
+    sed -i "$@"
+  fi
+}
 
 declare -a PNPM_CMD
 configure_pnpm
@@ -159,8 +160,8 @@ fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
 "
 
 echo "🧹 Cleaning up Vite template..."
-$SED_INPLACE '/<link rel="icon".*/d' index.html
-$SED_INPLACE 's/<title>.*<\/title>/<title>'"$PROJECT_NAME"'<\/title>/' index.html
+sed_in_place '/<link rel="icon".*/d' index.html
+sed_in_place 's/<title>.*<\/title>/<title>'"$PROJECT_NAME"'<\/title>/' index.html
 
 echo "📦 Installing base dependencies..."
 run_pnpm_quiet install

package/src/server/web-artifacts.ts

@@ -2,9 +2,11 @@ import { spawn } from 'node:child_process';
 import {
   copyFileSync,
   existsSync,
+  readdirSync,
   mkdirSync,
   readFileSync,
   statSync,
+  unlinkSync,
   writeFileSync,
 } from 'node:fs';
 import { basename, delimiter, dirname, isAbsolute, join, relative, resolve } from 'node:path';
@@ -71,6 +73,7 @@ export interface WebArtifactCanvasBuildResult extends WebArtifactBuildOutput {
   openedInCanvas: boolean;
   nodeId?: string;
   url?: string;
+  completedAt: string;
 }
 
 function currentWorkspaceRoot(): string {
@@ -300,6 +303,14 @@ function writeProjectFiles(
   }
 }
 
+function removeLiteralSedBackupFiles(projectPath: string): void {
+  for (const entry of readdirSync(projectPath, { withFileTypes: true })) {
+    if (entry.isFile() && entry.name.endsWith("''")) {
+      unlinkSync(join(projectPath, entry.name));
+    }
+  }
+}
+
 function ensurePackageManagerBoundary(dirPath: string): void {
   const packageJsonPath = join(dirPath, 'package.json');
   mkdirSync(dirPath, { recursive: true });
@@ -401,6 +412,7 @@ export async function executeWebArtifactBuild(
     });
     stdout = [stdout, initResult.stdout].filter(Boolean).join('\n');
     stderr = [stderr, initResult.stderr].filter(Boolean).join('\n');
+    removeLiteralSedBackupFiles(projectPath);
   }
 
   writeProjectFiles(projectPath, input);
@@ -508,7 +520,7 @@ export async function buildWebArtifactOnCanvas(input: WebArtifactBuildInput & {
 }): Promise<WebArtifactCanvasBuildResult> {
   const build = await executeWebArtifactBuild(input);
   if (input.openInCanvas === false) {
-    return { ...build, openedInCanvas: false };
+    return { ...build, openedInCanvas: false, completedAt: new Date().toISOString() };
   }
   const opened = openWebArtifactInCanvas({
     title: input.title,
@@ -519,5 +531,6 @@ export async function buildWebArtifactOnCanvas(input: WebArtifactBuildInput & {
     openedInCanvas: true,
     nodeId: opened.nodeId,
     url: opened.url,
+    completedAt: new Date().toISOString(),
   };
 }