fix(macos): drop Textual from chat packaging · openclaw/openclaw@cd7e3df

Recent Commits to openclaw:main

vincentkoc · 2026-06-24 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ let package = Package(`
`20`	`20`	`.package(url: "https://github.com/apple/swift-log.git", from: "1.10.1"),`
`21`	`21`	`.package(url: "https://github.com/sparkle-project/Sparkle", from: "2.9.0"),`
`22`	`22`	`.package(url: "https://github.com/steipete/Peekaboo.git", exact: "3.5.2"),`
	`23`	`+.package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.3.1"),`
`23`	`24`	`.package(path: "../shared/OpenClawKit"),`
`24`	`25`	`.package(path: "../swabble"),`
`25`	`26`	`],`
`@@ -54,6 +55,7 @@ let package = Package(`
`54`	`55`	`.product(name: "Sparkle", package: "Sparkle"),`
`55`	`56`	`.product(name: "PeekabooBridge", package: "Peekaboo"),`
`56`	`57`	`.product(name: "PeekabooAutomationKit", package: "Peekaboo"),`
	`58`	`+.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),`
`57`	`59`	`],`
`58`	`60`	`exclude: [`
`59`	`61`	`"Resources/Info.plist",`

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ let package = Package(`
`19`	`19`	`],`
`20`	`20`	`dependencies: [`
`21`	`21`	`.package(url: "https://github.com/steipete/ElevenLabsKit", exact: "0.1.1"),`
`22`		`-.package(url: "https://github.com/gonzalezreal/textual", exact: "0.3.1"),`
`23`	`22`	`],`
`24`	`23`	`targets: [`
`25`	`24`	`.target(`
`@@ -45,10 +44,6 @@ let package = Package(`
`45`	`44`	`name: "OpenClawChatUI",`
`46`	`45`	`dependencies: [`
`47`	`46`	`"OpenClawKit",`
`48`		`-.product(`
`49`		`- name: "Textual",`
`50`		`-package: "textual",`
`51`		`- condition: .when(platforms: [.macOS, .iOS])),`
`52`	`47`	`],`
`53`	`48`	`path: "Sources/OpenClawChatUI",`
`54`	`49`	`swiftSettings: [`

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
	`1`	`+import Foundation`
`1`	`2`	`import SwiftUI`
`2`		`-import Textual`
`3`	`3`
`4`	`4`	`public enum ChatMarkdownVariant: String, CaseIterable, Sendable {`
`5`	`5`	`case standard`
`@@ -22,46 +22,28 @@ struct ChatMarkdownRenderer: View {`
`22`	`22`	`var body: some View {`
`23`	`23`	`let processed = ChatMarkdownPreprocessor.preprocess(markdown: self.text)`
`24`	`24`	`VStack(alignment: .leading, spacing: 10) {`
`25`		`-StructuredText(markdown: processed.cleaned)`
`26`		`-.modifier(ChatMarkdownStyle(`
`27`		`- variant: self.variant,`
`28`		`- context: self.context,`
`29`		`- font: self.font,`
`30`		`- textColor: self.textColor))`
	`25`	`+Text(self.markdownText(processed.cleaned))`
	`26`	`+.font(self.font)`
	`27`	`+.foregroundStyle(self.textColor)`
	`28`	`+.tint(self.linkColor)`
	`29`	`+.textSelection(.enabled)`
	`30`	`+.lineSpacing(self.variant == .compact ? 2 : 4)`
`31`	`31`
`32`	`32`	`if !processed.images.isEmpty {`
`33`	`33`	`InlineImageList(images: processed.images)`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`}`
`37`		`-}`
`38`		`-`
`39`		`-private struct ChatMarkdownStyle: ViewModifier {`
`40`		`-let variant: ChatMarkdownVariant`
`41`		`-let context: ChatMarkdownRenderer.Context`
`42`		`-let font: Font`
`43`		`-let textColor: Color`
`44`	`37`
`45`		`-func body(content: Content) -> some View {`
`46`		`-Group {`
`47`		`-if self.variant == .compact {`
`48`		`- content.textual.structuredTextStyle(.default)`
`49`		`-} else {`
`50`		`- content.textual.structuredTextStyle(.gitHub)`
`51`		`-}`
`52`		`-}`
`53`		`-.font(self.font)`
`54`		`-.foregroundStyle(self.textColor)`
`55`		`-.textual.inlineStyle(self.inlineStyle)`
`56`		`-.textual.textSelection(.enabled)`
	`38`	`+private var linkColor: Color {`
	`39`	`+self.context == .user ? self.textColor : OpenClawChatTheme.accent`
`57`	`40`	`}`
`58`	`41`
`59`		`-private var inlineStyle: InlineStyle {`
`60`		`-let linkColor: Color = self.context == .user ? self.textColor : OpenClawChatTheme.accent`
`61`		`-let codeScale: CGFloat = self.variant == .compact ? 0.85 : 0.9`
`62`		`-return InlineStyle()`
`63`		`-.code(.monospaced, .fontScale(codeScale))`
`64`		`-.link(.foregroundColor(linkColor))`
	`42`	`+private func markdownText(_ markdown: String) -> AttributedString {`
	`43`	`+let options = AttributedString.MarkdownParsingOptions(`
	`44`	`+ interpretedSyntax: .full,`
	`45`	`+ failurePolicy: .returnPartiallyParsedIfPossible)`
	`46`	`+return (try? AttributedString(markdown: markdown, options: options)) ?? AttributedString(markdown)`
`65`	`47`	`}`
`66`	`48`	`}`
`67`	`49`

Original file line number	Diff line number	Diff line change
`@@ -304,33 +304,6 @@ else`
`304`	`304`	`exit 1`
`305`	`305`	`fi`
`306`	`306`
`307`		`-echo "📦 Copying Textual resources"`
`308`		`-TEXTUAL_BUNDLE_DIR="$(build_path_for_arch "$PRIMARY_ARCH")/$BUILD_CONFIG"`
`309`		`-TEXTUAL_BUNDLE=""`
`310`		`-for candidate in \`
`311`		`-"$TEXTUAL_BUNDLE_DIR/textual_Textual.bundle" \`
`312`		`-"$TEXTUAL_BUNDLE_DIR/Textual_Textual.bundle"`
`313`		`-do`
`314`		`-if [ -d "$candidate" ]; then`
`315`		`- TEXTUAL_BUNDLE="$candidate"`
`316`		`-break`
`317`		`-fi`
`318`		`-done`
`319`		`-if [ -z "$TEXTUAL_BUNDLE" ]; then`
`320`		`- TEXTUAL_BUNDLE="$(find "$BUILD_ROOT" -type d $ -name "textual_Textual.bundle" -o -name "Textual_Textual.bundle" $ -print -quit)"`
`321`		`-fi`
`322`		`-if [ -n "$TEXTUAL_BUNDLE" ] && [ -d "$TEXTUAL_BUNDLE" ]; then`
`323`		`- rm -rf "$APP_ROOT/Contents/Resources/$(basename "$TEXTUAL_BUNDLE")"`
`324`		`- cp -R "$TEXTUAL_BUNDLE" "$APP_ROOT/Contents/Resources/"`
`325`		`-else`
`326`		`-if [[ "${ALLOW_MISSING_TEXTUAL_BUNDLE:-0}" == "1" ]]; then`
`327`		`-echo "WARN: Textual resource bundle not found (continuing due to ALLOW_MISSING_TEXTUAL_BUNDLE=1)" >&2`
`328`		`-else`
`329`		`-echo "ERROR: Textual resource bundle not found. Set ALLOW_MISSING_TEXTUAL_BUNDLE=1 to bypass." >&2`
`330`		`-exit 1`
`331`		`-fi`
`332`		`-fi`
`333`		`-`
`334`	`307`	`running_packaged_app_pids() {`
`335`	`308`	`command -v pgrep >/dev/null 2>&1 \|\| return 0`
`336`	`309`	`local app_binary="$APP_ROOT/Contents/MacOS/OpenClaw"`

Original file line number	Diff line number	Diff line change
`@@ -387,13 +387,15 @@ describe("package-mac-app plist stamping", () => {`
`387`	`387`	`script.indexOf(`
`388`	`388`	`'OPENCLAWKIT_BUNDLE="$(build_path_for_arch "$PRIMARY_ARCH")/$BUILD_CONFIG/OpenClawKit_OpenClawKit.bundle"',`
`389`	`389`	`),`
`390`		`-script.indexOf('echo "📦 Copying Textual resources"'),`
	`390`	`+script.indexOf("running_packaged_app_pids()"),`
`391`	`391`	`);`
`392`	`392`
`393`	`393`	`expect(openClawKitBlock).toContain("ERROR: OpenClawKit resource bundle not found");`
`394`	`394`	`expect(openClawKitBlock).toContain("exit 1");`
`395`	`395`	`expect(openClawKitBlock).not.toContain("WARN:");`
`396`	`396`	`expect(openClawKitBlock).not.toContain("continuing");`
	`397`	`+expect(script).not.toContain("Textual resource bundle");`
	`398`	`+expect(script).not.toContain("ALLOW_MISSING_TEXTUAL_BUNDLE");`
`397`	`399`	`});`
`398`	`400`
`399`	`401`	`it("does not mask required Info.plist stamp failures", () => {`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main