From 993bdd2b25a3525d7b4819f800a96729124b96cc Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Wed, 6 Sep 2023 08:34:04 -0400
Subject: [PATCH 01/33] don't repeat log attributes during publishing

---
 internal/publish/publish.go | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/internal/publish/publish.go b/internal/publish/publish.go
index af29fcf0d..ab21c95b9 100644
--- a/internal/publish/publish.go
+++ b/internal/publish/publish.go
@@ -120,7 +120,7 @@ type DeploymentNotFoundDetails struct {
 	ContentID types.ContentID
 }
 
-func withLog[T any](op events.Operation, msg string, log logging.Logger, fn func() (T, error)) (value T, err error) {
+func withLog[T any](op events.Operation, msg string, label string, log logging.Logger, fn func() (T, error)) (value T, err error) {
 	log = log.With(logging.LogKeyOp, op)
 	log.Start(msg)
 	value, err = fn()
@@ -130,14 +130,13 @@ func withLog[T any](op events.Operation, msg string, log logging.Logger, fn func
 		err = types.ErrToAgentError(op, err)
 		return
 	}
-	log.Success("Done " + msg)
+	log.Success("Done", label, value)
 	return value, nil
 }
 
 func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, account *accounts.Account, client clients.APIClient, log logging.Logger) error {
-	log = log.With(
-		"server", account.URL,
-		logging.LogKeyOp, events.PublishCreateBundleOp)
+	log.Info("Starting deployment to server", "server", account.URL)
+	log = log.With(logging.LogKeyOp, events.PublishCreateBundleOp)
 	log.Start("Creating bundle")
 	bundleFile, err := os.CreateTemp("", "bundle-*.tar.gz")
 	if err != nil {
@@ -159,9 +158,8 @@ func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, acco
 	var contentID types.ContentID
 	if cmd.State.Target.ContentId != "" && !cmd.New {
 		contentID = cmd.State.Target.ContentId
-		log = log.With("content_id", contentID)
-		_, err := withLog(events.PublishCreateDeploymentOp, "Updating deployment", log, func() (any, error) {
-			return nil, client.UpdateDeployment(contentID, cmd.State.Connect.Content)
+		_, err := withLog(events.PublishCreateDeploymentOp, "Updating deployment", "content_id", log, func() (any, error) {
+			return contentID, client.UpdateDeployment(contentID, cmd.State.Connect.Content)
 		})
 		if err != nil {
 			httpErr, ok := err.(*clients.HTTPError)
@@ -174,22 +172,21 @@ func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, acco
 			return err
 		}
 	} else {
-		contentID, err = withLog(events.PublishCreateDeploymentOp, "Creating deployment", log, func() (types.ContentID, error) {
+		contentID, err = withLog(events.PublishCreateDeploymentOp, "Creating deployment", "content_id", log, func() (types.ContentID, error) {
 			return client.CreateDeployment(cmd.State.Connect.Content)
 		})
 		if err != nil {
 			return err
 		}
-		log = log.With("content_id", contentID)
+		log.Info("content_id", contentID)
 	}
 
-	bundleID, err := withLog(events.PublishUploadBundleOp, "Uploading deployment bundle", log, func() (types.BundleID, error) {
+	bundleID, err := withLog(events.PublishUploadBundleOp, "Uploading deployment bundle", "bundle_id", log, func() (types.BundleID, error) {
 		return client.UploadBundle(contentID, bundleFile)
 	})
 	if err != nil {
 		return err
 	}
-	log = log.With("bundle_id", bundleID)
 
 	cmd.State.Target = state.TargetID{
 		ServerType:  account.ServerType,
@@ -202,13 +199,12 @@ func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, acco
 		DeployedAt:  types.NewOptional(time.Now()),
 	}
 
-	taskID, err := withLog(events.PublishDeployBundleOp, "Initiating bundle deployment", log, func() (types.TaskID, error) {
+	taskID, err := withLog(events.PublishDeployBundleOp, "Initiating bundle deployment", "task_id", log, func() (types.TaskID, error) {
 		return client.DeployBundle(contentID, bundleID)
 	})
 	if err != nil {
 		return err
 	}
-	log = log.With("task_id", taskID)
 
 	taskLogger := log.With("source", "serverLog")
 	err = client.WaitForTask(taskID, taskLogger)

From 387dc435ef569dfe9e8072d35effe438ba992d6d Mon Sep 17 00:00:00 2001
From: tdstein <taylor.steinberg@posit.co>
Date: Thu, 7 Sep 2023 12:15:33 -0400
Subject: [PATCH 02/33] Fixes ignore matching on directories

---
 internal/bundles/gitignore/gitignore.go       |  3 ++-
 internal/bundles/gitignore/gitignore_test.go  | 13 +++++++++++++
 test/sample-content/fastapi-simple/.gitignore |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 test/sample-content/fastapi-simple/.gitignore

diff --git a/internal/bundles/gitignore/gitignore.go b/internal/bundles/gitignore/gitignore.go
index f76b3c7f4..3aaa9f9df 100644
--- a/internal/bundles/gitignore/gitignore.go
+++ b/internal/bundles/gitignore/gitignore.go
@@ -319,7 +319,8 @@ func (ign *GitIgnoreList) match(path string, info os.FileInfo) *Match {
 // Match returns whether any of the globs in the ignore list match the
 // specified path. Uses the same matching rules as .gitignore files.
 func (ign *GitIgnoreList) Match(path string) *Match {
-	return ign.match(path, nil)
+	stat, _ := ign.fs.Stat(path)
+	return ign.match(path, stat)
 }
 
 // Walk walks the file tree with the specified root and calls fn on each file
diff --git a/internal/bundles/gitignore/gitignore_test.go b/internal/bundles/gitignore/gitignore_test.go
index d0b247d15..5311edd96 100644
--- a/internal/bundles/gitignore/gitignore_test.go
+++ b/internal/bundles/gitignore/gitignore_test.go
@@ -75,4 +75,17 @@ func (s *GitIgnoreSuite) TestMatch() {
 	s.Equal("*.bak", m.Pattern)
 	s.Equal("", m.FilePath)
 	s.Equal(0, m.Line)
+
+	ignoredir := s.cwd.Join("ignoredir")
+	err = ignoredir.MkdirAll(0700)
+	s.NoError(err)
+	err = ign.AppendGlobs([]string{"ignoredir/"}, MatchSourceUser)
+	s.NoError(err)
+
+	m = ign.Match(ignoredir.Path())
+	s.NotNil(m)
+	s.Equal(MatchSourceUser, m.Source)
+	s.Equal("ignoredir/", m.Pattern)
+	s.Equal("", m.FilePath)
+	s.Equal(0, m.Line)
 }
diff --git a/test/sample-content/fastapi-simple/.gitignore b/test/sample-content/fastapi-simple/.gitignore
new file mode 100644
index 000000000..1d17dae13
--- /dev/null
+++ b/test/sample-content/fastapi-simple/.gitignore
@@ -0,0 +1 @@
+.venv

From 6be8d6ed9b59028934f3e70540ae9d657e9d43c1 Mon Sep 17 00:00:00 2001
From: tdstein <taylor.steinberg@posit.co>
Date: Thu, 7 Sep 2023 12:56:22 -0400
Subject: [PATCH 03/33] Modifies IgnoreList interface

---
 internal/bundles/gitignore/gitignore.go      | 11 ++++++++---
 internal/bundles/gitignore/gitignore_test.go | 12 ++++++++----
 internal/bundles/gitignore/interface.go      |  8 +++++---
 internal/services/api/files/files.go         |  6 +++++-
 internal/services/api/files/services.go      |  6 +++++-
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/internal/bundles/gitignore/gitignore.go b/internal/bundles/gitignore/gitignore.go
index 3aaa9f9df..db7fc4d05 100644
--- a/internal/bundles/gitignore/gitignore.go
+++ b/internal/bundles/gitignore/gitignore.go
@@ -318,9 +318,14 @@ func (ign *GitIgnoreList) match(path string, info os.FileInfo) *Match {
 
 // Match returns whether any of the globs in the ignore list match the
 // specified path. Uses the same matching rules as .gitignore files.
-func (ign *GitIgnoreList) Match(path string) *Match {
-	stat, _ := ign.fs.Stat(path)
-	return ign.match(path, stat)
+func (ign *GitIgnoreList) Match(path string) (*Match, error) {
+	stat, err := ign.fs.Stat(path)
+	if err != nil {
+		if !os.IsNotExist(err) {
+			return nil, err
+		}
+	}
+	return ign.match(path, stat), nil
 }
 
 // Walk walks the file tree with the specified root and calls fn on each file
diff --git a/internal/bundles/gitignore/gitignore_test.go b/internal/bundles/gitignore/gitignore_test.go
index 5311edd96..9e8a212d8 100644
--- a/internal/bundles/gitignore/gitignore_test.go
+++ b/internal/bundles/gitignore/gitignore_test.go
@@ -57,11 +57,13 @@ func (s *GitIgnoreSuite) TestMatch() {
 	s.NoError(err)
 
 	// Match returns nil if no match
-	m := ign.Match("app.py")
+	m, err := ign.Match("app.py")
+	s.Nil(err)
 	s.Nil(m)
 
 	// File matches include file info
-	m = ign.Match(".Rhistory")
+	m, err = ign.Match(".Rhistory")
+	s.Nil(err)
 	s.NotNil(m)
 	s.Equal(MatchSourceFile, m.Source)
 	s.Equal(".Rhistory", m.Pattern)
@@ -69,7 +71,8 @@ func (s *GitIgnoreSuite) TestMatch() {
 	s.Equal(1, m.Line)
 
 	// Non-file matches don't include file info
-	m = ign.Match("app.py.bak")
+	m, err = ign.Match("app.py.bak")
+	s.Nil(err)
 	s.NotNil(m)
 	s.Equal(MatchSourceUser, m.Source)
 	s.Equal("*.bak", m.Pattern)
@@ -82,7 +85,8 @@ func (s *GitIgnoreSuite) TestMatch() {
 	err = ign.AppendGlobs([]string{"ignoredir/"}, MatchSourceUser)
 	s.NoError(err)
 
-	m = ign.Match(ignoredir.Path())
+	m, err = ign.Match(ignoredir.Path())
+	s.Nil(err)
 	s.NotNil(m)
 	s.Equal(MatchSourceUser, m.Source)
 	s.Equal("ignoredir/", m.Pattern)
diff --git a/internal/bundles/gitignore/interface.go b/internal/bundles/gitignore/interface.go
index 0ab74568d..0a9721be8 100644
--- a/internal/bundles/gitignore/interface.go
+++ b/internal/bundles/gitignore/interface.go
@@ -12,7 +12,7 @@ type IgnoreList interface {
 	Append(path util.Path) error
 	AppendGlobs(patterns []string, source MatchSource) error
 	AppendGit() error
-	Match(path string) *Match
+	Match(path string) (*Match, error)
 	Walk(root util.Path, fn util.WalkFunc) error
 }
 
@@ -38,9 +38,9 @@ func (m *MockGitIgnoreList) AppendGit() error {
 	return args.Error(0)
 }
 
-func (m *MockGitIgnoreList) Match(path string) bool {
+func (m *MockGitIgnoreList) Match(path string) (*Match, error) {
 	args := m.Called(path)
-	return args.Bool(0)
+	return args.Get(0).(*Match), args.Error(1)
 }
 
 func (m *MockGitIgnoreList) Walk(root util.Path, fn util.WalkFunc) error {
@@ -48,6 +48,8 @@ func (m *MockGitIgnoreList) Walk(root util.Path, fn util.WalkFunc) error {
 	return args.Error(0)
 }
 
+var _ IgnoreList = &MockGitIgnoreList{}
+
 // Maintain a reference to the original gitignore so it
 // and its license remain in our vendor directory.
 type _ gitignore.IgnoreList
diff --git a/internal/services/api/files/files.go b/internal/services/api/files/files.go
index eee18ad19..4770d2bc9 100644
--- a/internal/services/api/files/files.go
+++ b/internal/services/api/files/files.go
@@ -86,7 +86,11 @@ func (f *File) insert(root util.Path, path util.Path, ignore gitignore.IgnoreLis
 		}
 
 		// otherwise, create it
-		exclusion := ignore.Match(path.Path())
+		exclusion, err := ignore.Match(path.Path())
+		if err != nil {
+			return nil, err
+		}
+
 		child, err := CreateFile(root, path, exclusion)
 		if err != nil {
 			return nil, err
diff --git a/internal/services/api/files/services.go b/internal/services/api/files/services.go
index 71a698900..59ef7b3b1 100644
--- a/internal/services/api/files/services.go
+++ b/internal/services/api/files/services.go
@@ -38,7 +38,11 @@ type filesService struct {
 
 func (s filesService) GetFile(p util.Path) (*File, error) {
 	p = p.Clean()
-	m := s.ignore.Match(p.String())
+	m, err := s.ignore.Match(p.String())
+	if err != nil {
+		return nil, err
+	}
+
 	file, err := CreateFile(s.root, p, m)
 	if err != nil {
 		return nil, err

From 5be263e7e7e8a14f75f6b602e7bf252c22ac90a8 Mon Sep 17 00:00:00 2001
From: tdstein <taylor.steinberg@posit.co>
Date: Thu, 7 Sep 2023 13:03:34 -0400
Subject: [PATCH 04/33] Changes error assertions to NoError

---
 internal/bundles/gitignore/gitignore_test.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/internal/bundles/gitignore/gitignore_test.go b/internal/bundles/gitignore/gitignore_test.go
index 9e8a212d8..9463a0f3a 100644
--- a/internal/bundles/gitignore/gitignore_test.go
+++ b/internal/bundles/gitignore/gitignore_test.go
@@ -58,12 +58,12 @@ func (s *GitIgnoreSuite) TestMatch() {
 
 	// Match returns nil if no match
 	m, err := ign.Match("app.py")
-	s.Nil(err)
+	s.NoError(err)
 	s.Nil(m)
 
 	// File matches include file info
 	m, err = ign.Match(".Rhistory")
-	s.Nil(err)
+	s.NoError(err)
 	s.NotNil(m)
 	s.Equal(MatchSourceFile, m.Source)
 	s.Equal(".Rhistory", m.Pattern)
@@ -72,7 +72,7 @@ func (s *GitIgnoreSuite) TestMatch() {
 
 	// Non-file matches don't include file info
 	m, err = ign.Match("app.py.bak")
-	s.Nil(err)
+	s.NoError(err)
 	s.NotNil(m)
 	s.Equal(MatchSourceUser, m.Source)
 	s.Equal("*.bak", m.Pattern)
@@ -86,7 +86,7 @@ func (s *GitIgnoreSuite) TestMatch() {
 	s.NoError(err)
 
 	m, err = ign.Match(ignoredir.Path())
-	s.Nil(err)
+	s.NoError(err)
 	s.NotNil(m)
 	s.Equal(MatchSourceUser, m.Source)
 	s.Equal("ignoredir/", m.Pattern)

From 9cbe75bdb1686e9180dee422b9014e4b3d2ed29d Mon Sep 17 00:00:00 2001
From: tdstein <taylor.steinberg@posit.co>
Date: Fri, 8 Sep 2023 10:49:40 -0400
Subject: [PATCH 05/33] Removes non-regular files from file count

---
 web/src/components/panels/FilesToPublish.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/web/src/components/panels/FilesToPublish.vue b/web/src/components/panels/FilesToPublish.vue
index 8c5082fe6..0e3e90d7b 100644
--- a/web/src/components/panels/FilesToPublish.vue
+++ b/web/src/components/panels/FilesToPublish.vue
@@ -34,7 +34,7 @@ const deploymentStore = useDeploymentStore();
 const files = ref<QTreeNode[]>([]);
 const expanded = ref<string[]>([]);
 
-type FileInfo = Pick<DeploymentFile, 'size' | 'isEntrypoint' | 'exclusion'>;
+type FileInfo = Pick<DeploymentFile, 'size' | 'isEntrypoint' | 'exclusion' | 'isFile' >;
 
 const fileMap = ref(new Map<string, FileInfo>());
 
@@ -56,9 +56,14 @@ const selectedFileTotalSize = computed(() : string => {
 });
 
 const fileSummary = computed(() => {
-  const count = deploymentStore.files.length;
   const path = deploymentStore.deployment?.sourcePath;
 
+  // Calculate the number of files that are "files" (i.e., regular files, not directories, symlinks, etc.)
+  const count = deploymentStore.files
+    .map(file => fileMap.value.get(file))
+    .filter(info => info?.isFile)
+    .length;
+
   if (count) {
     return `${count} files selected from ${path} (total = ${selectedFileTotalSize.value})`;
   } else if (path) {
@@ -83,6 +88,7 @@ function populateFileMap(file: DeploymentFile) {
     size: file.size,
     isEntrypoint: file.isEntrypoint,
     exclusion: file.exclusion,
+    isFile: file.isFile
   };
   fileMap.value.set(file.id, info);
   file.files.forEach(populateFileMap);

From 52b5e3f01bd688cf52fa96fd645c3400e9c11196 Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Mon, 11 Sep 2023 13:37:12 -0400
Subject: [PATCH 06/33] resolve duplicate event_op attributes

---
 internal/publish/publish.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/internal/publish/publish.go b/internal/publish/publish.go
index ab21c95b9..1ed1f6332 100644
--- a/internal/publish/publish.go
+++ b/internal/publish/publish.go
@@ -136,8 +136,6 @@ func withLog[T any](op events.Operation, msg string, label string, log logging.L
 
 func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, account *accounts.Account, client clients.APIClient, log logging.Logger) error {
 	log.Info("Starting deployment to server", "server", account.URL)
-	log = log.With(logging.LogKeyOp, events.PublishCreateBundleOp)
-	log.Start("Creating bundle")
 	bundleFile, err := os.CreateTemp("", "bundle-*.tar.gz")
 	if err != nil {
 		return types.ErrToAgentError(events.PublishCreateBundleOp, err)
@@ -145,7 +143,10 @@ func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, acco
 	defer os.Remove(bundleFile.Name())
 	defer bundleFile.Close()
 
-	_, err = bundler.CreateBundle(bundleFile)
+	_, err = withLog(events.PublishCreateBundleOp, "Creating bundle", "filename", log, func() (any, error) {
+		_, err := bundler.CreateBundle(bundleFile)
+		return bundleFile.Name(), err
+	})
 	if err != nil {
 		return types.ErrToAgentError(events.PublishCreateBundleOp, err)
 	}
@@ -153,7 +154,6 @@ func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, acco
 	if err != nil {
 		return types.ErrToAgentError(events.PublishCreateBundleOp, err)
 	}
-	log.Success("Done creating bundle")
 
 	var contentID types.ContentID
 	if cmd.State.Target.ContentId != "" && !cmd.New {

From c980001efb3a04beacb7bed80a5346614bdb9f39 Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Mon, 11 Sep 2023 13:37:28 -0400
Subject: [PATCH 07/33] add progress events for package actions

---
 internal/api_client/clients/client_connect.go | 73 ++++++++++++++++++-
 1 file changed, 69 insertions(+), 4 deletions(-)

diff --git a/internal/api_client/clients/client_connect.go b/internal/api_client/clients/client_connect.go
index b447c2ef6..8fceb5f30 100644
--- a/internal/api_client/clients/client_connect.go
+++ b/internal/api_client/clients/client_connect.go
@@ -241,19 +241,73 @@ func (c *ConnectClient) getTask(taskID types.TaskID, previous *taskDTO) (*taskDT
 	return &task, nil
 }
 
+var buildAPIPattern = regexp.MustCompile("Building (Shiny application|Plumber API).*")
+var buildAppPattern = regexp.MustCompile("Building (.* application|.* API|Jupyter notebook).*")
+var launchPattern = regexp.MustCompile("Launching .* (application|API|notebook)")
+var staticPattern = regexp.MustCompile("(Building|Launching) static content")
+
 func eventOpFromLogLine(currentOp events.Operation, line string) events.Operation {
-	if match, _ := regexp.MatchString("Building (Shiny application|Plumber API).*", line); match {
+	if match := buildAPIPattern.MatchString(line); match {
 		return events.PublishRestoreREnvOp
-	} else if match, _ := regexp.MatchString("Building (.* application|.* API|Jupyter notebook).*", line); match {
+	} else if match := buildAppPattern.MatchString(line); match {
 		return events.PublishRestorePythonEnvOp
-	} else if match, _ := regexp.MatchString("Launching .* (application|API|notebook)", line); match {
+	} else if match := launchPattern.MatchString(line); match {
 		return events.PublishRunContentOp
-	} else if match, _ := regexp.MatchString("(Building|Launching) static content", line); match {
+	} else if match := staticPattern.MatchString(line); match {
 		return events.PublishRunContentOp
 	}
 	return currentOp
 }
 
+type runtime string
+
+const (
+	rRuntime      runtime = "r"
+	pythonRuntime runtime = "python"
+)
+
+type packageStatus string
+
+const (
+	downloadAndInstallPackage packageStatus = "download+install"
+	downloadPackage           packageStatus = "download"
+	installPackage            packageStatus = "install"
+)
+
+var rPackagePattern = regexp.MustCompile(`Installing ([[:word:]\.]+) (\(\S+\)) ...`)
+var pythonDownloadingPackagePattern = regexp.MustCompile(`Downloading (\S+)-(\S+)-`)
+var pythonCollectingPackagePattern = regexp.MustCompile(`Collecting (\S+)==(\S+)`)
+var pythonInstallingPackagePattern = regexp.MustCompile(`Found existing installation: (\S+) (\S+)`)
+
+type packageEvent struct {
+	runtime runtime
+	status  packageStatus
+	name    string
+	version string
+}
+
+func makePackageEvent(match []string, rt runtime, status packageStatus) *packageEvent {
+	return &packageEvent{
+		runtime: rt,
+		status:  status,
+		name:    match[1],
+		version: match[2],
+	}
+}
+
+func packageEventFromLogLine(line string) *packageEvent {
+	if match := rPackagePattern.FindStringSubmatch(line); match != nil {
+		return makePackageEvent(match, rRuntime, downloadAndInstallPackage)
+	} else if match := pythonDownloadingPackagePattern.FindStringSubmatch(line); match != nil {
+		return makePackageEvent(match, pythonRuntime, downloadPackage)
+	} else if match := pythonCollectingPackagePattern.FindStringSubmatch(line); match != nil {
+		return makePackageEvent(match, pythonRuntime, downloadPackage)
+	} else if match := pythonInstallingPackagePattern.FindStringSubmatch(line); match != nil {
+		return makePackageEvent(match, pythonRuntime, installPackage)
+	}
+	return nil
+}
+
 func (c *ConnectClient) WaitForTask(taskID types.TaskID, log logging.Logger) error {
 	var previous *taskDTO
 	var op events.Operation
@@ -264,6 +318,7 @@ func (c *ConnectClient) WaitForTask(taskID types.TaskID, log logging.Logger) err
 			return err
 		}
 		for _, line := range task.Output {
+			// Detect state transitions from certain matching log lines.
 			nextOp := eventOpFromLogLine(op, line)
 			if nextOp != op {
 				if op != "" {
@@ -273,6 +328,16 @@ func (c *ConnectClient) WaitForTask(taskID types.TaskID, log logging.Logger) err
 				log = log.With(logging.LogKeyOp, op)
 			}
 			log.Info(line)
+
+			// Log a progress event for certain matching log lines.
+			event := packageEventFromLogLine(line)
+			if event != nil {
+				log.Status("Package restore",
+					"runtime", event.runtime,
+					"status", event.status,
+					"name", event.name,
+					"version", event.version)
+			}
 		}
 		if task.Finished {
 			if task.Error != "" {

From bd2cb2115fc709544e6f0910536e35f136276501 Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Tue, 12 Sep 2023 12:10:36 -0400
Subject: [PATCH 08/33] tests

---
 internal/api_client/clients/client_connect.go |  79 ++++---
 .../api_client/clients/client_connect_test.go | 216 ++++++++++++++++++
 internal/api_client/clients/http_client.go    |   2 +-
 internal/bundles/bundle.go                    |   2 +-
 internal/logging/logger.go                    |  36 +--
 internal/logging/logger_test.go               |  45 ++--
 internal/logging/loggingtest/mock_logger.go   |  41 +---
 internal/logging/mock_base_logger.go          |  63 +++++
 .../logging/{loggingtest => }/mock_handler.go |   2 +-
 internal/logging/multi_handler_test.go        |  42 ++--
 internal/publish/publish.go                   |   8 +-
 internal/services/middleware/log_request.go   |   4 +-
 internal/services/proxy/http_proxy.go         |   2 +-
 13 files changed, 411 insertions(+), 131 deletions(-)
 create mode 100644 internal/api_client/clients/client_connect_test.go
 create mode 100644 internal/logging/mock_base_logger.go
 rename internal/logging/{loggingtest => }/mock_handler.go (97%)

diff --git a/internal/api_client/clients/client_connect.go b/internal/api_client/clients/client_connect.go
index 8fceb5f30..c6754d416 100644
--- a/internal/api_client/clients/client_connect.go
+++ b/internal/api_client/clients/client_connect.go
@@ -241,15 +241,15 @@ func (c *ConnectClient) getTask(taskID types.TaskID, previous *taskDTO) (*taskDT
 	return &task, nil
 }
 
-var buildAPIPattern = regexp.MustCompile("Building (Shiny application|Plumber API).*")
-var buildAppPattern = regexp.MustCompile("Building (.* application|.* API|Jupyter notebook).*")
+var buildRPattern = regexp.MustCompile("Building (Shiny application|Plumber API|R Markdown document).*")
+var buildPythonPattern = regexp.MustCompile("Building (.* application|.* API|Jupyter notebook).*")
 var launchPattern = regexp.MustCompile("Launching .* (application|API|notebook)")
 var staticPattern = regexp.MustCompile("(Building|Launching) static content")
 
 func eventOpFromLogLine(currentOp events.Operation, line string) events.Operation {
-	if match := buildAPIPattern.MatchString(line); match {
+	if match := buildRPattern.MatchString(line); match {
 		return events.PublishRestoreREnvOp
-	} else if match := buildAppPattern.MatchString(line); match {
+	} else if match := buildPythonPattern.MatchString(line); match {
 		return events.PublishRestorePythonEnvOp
 	} else if match := launchPattern.MatchString(line); match {
 		return events.PublishRunContentOp
@@ -277,7 +277,7 @@ const (
 var rPackagePattern = regexp.MustCompile(`Installing ([[:word:]\.]+) (\(\S+\)) ...`)
 var pythonDownloadingPackagePattern = regexp.MustCompile(`Downloading (\S+)-(\S+)-`)
 var pythonCollectingPackagePattern = regexp.MustCompile(`Collecting (\S+)==(\S+)`)
-var pythonInstallingPackagePattern = regexp.MustCompile(`Found existing installation: (\S+) (\S+)`)
+var pythonInstallingPackagePattern = regexp.MustCompile(`Found existing installation: (\S+) ()\S+`)
 
 type packageEvent struct {
 	runtime runtime
@@ -308,6 +308,43 @@ func packageEventFromLogLine(line string) *packageEvent {
 	return nil
 }
 
+func (c *ConnectClient) handleTaskUpdate(task *taskDTO, op types.Operation, log logging.Logger) (types.Operation, error) {
+	var nextOp types.Operation
+
+	for _, line := range task.Output {
+		// Detect state transitions from certain matching log lines.
+		nextOp = eventOpFromLogLine(op, line)
+		if nextOp != op {
+			if op != "" {
+				log.Success("Done")
+			}
+			op = nextOp
+			log = log.WithArgs(logging.LogKeyOp, op)
+		}
+		log.Info(line)
+
+		// Log a progress event for certain matching log lines.
+		event := packageEventFromLogLine(line)
+		if event != nil {
+			log.Status("Package restore",
+				"runtime", event.runtime,
+				"status", event.status,
+				"name", event.name,
+				"version", event.version)
+		}
+	}
+	if task.Finished {
+		if task.Error != "" {
+			// TODO: make these errors more specific, maybe by
+			// using the Connect error codes from the logs.
+			err := errors.New(task.Error)
+			return nextOp, types.NewAgentError(events.DeploymentFailedCode, err, nil)
+		}
+		log.Success("Done")
+	}
+	return nextOp, nil
+}
+
 func (c *ConnectClient) WaitForTask(taskID types.TaskID, log logging.Logger) error {
 	var previous *taskDTO
 	var op events.Operation
@@ -317,37 +354,9 @@ func (c *ConnectClient) WaitForTask(taskID types.TaskID, log logging.Logger) err
 		if err != nil {
 			return err
 		}
-		for _, line := range task.Output {
-			// Detect state transitions from certain matching log lines.
-			nextOp := eventOpFromLogLine(op, line)
-			if nextOp != op {
-				if op != "" {
-					log.Success("Done")
-				}
-				op = nextOp
-				log = log.With(logging.LogKeyOp, op)
-			}
-			log.Info(line)
-
-			// Log a progress event for certain matching log lines.
-			event := packageEventFromLogLine(line)
-			if event != nil {
-				log.Status("Package restore",
-					"runtime", event.runtime,
-					"status", event.status,
-					"name", event.name,
-					"version", event.version)
-			}
-		}
+		op, err = c.handleTaskUpdate(task, op, log)
 		if task.Finished {
-			if task.Error != "" {
-				// TODO: make these errors more specific, maybe by
-				// using the Connect error codes from the logs.
-				err := errors.New(task.Error)
-				return types.NewAgentError(events.DeploymentFailedCode, err, nil)
-			}
-			log.Success("Done")
-			return nil
+			return err
 		}
 		previous = task
 		time.Sleep(500 * time.Millisecond)
diff --git a/internal/api_client/clients/client_connect_test.go b/internal/api_client/clients/client_connect_test.go
new file mode 100644
index 000000000..d25bceda8
--- /dev/null
+++ b/internal/api_client/clients/client_connect_test.go
@@ -0,0 +1,216 @@
+package clients
+
+// Copyright (C) 2023 by Posit Software, PBC.
+
+import (
+	"io/fs"
+	"testing"
+	"time"
+
+	"github.com/rstudio/connect-client/internal/accounts"
+	"github.com/rstudio/connect-client/internal/events"
+	"github.com/rstudio/connect-client/internal/logging"
+	"github.com/rstudio/connect-client/internal/logging/loggingtest"
+	"github.com/rstudio/connect-client/internal/types"
+	"github.com/rstudio/connect-client/internal/util/utiltest"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/suite"
+)
+
+type ConnectClientSuite struct {
+	utiltest.Suite
+}
+
+func TestConnectClientSuite(t *testing.T) {
+	suite.Run(t, new(ConnectClientSuite))
+}
+
+func (s *ConnectClientSuite) TestNewConnectClient() {
+	account := &accounts.Account{}
+	timeout := 10 * time.Second
+	log := logging.New()
+
+	client, err := NewConnectClient(account, timeout, log)
+	s.NoError(err)
+	s.Equal(account, client.account)
+	s.Equal(log, client.log)
+	s.NotNil(client.client)
+}
+
+func (s *ConnectClientSuite) TestNewConnectClientErr() {
+	account := &accounts.Account{
+		Certificate: "/nonexistent",
+	}
+	timeout := 10 * time.Second
+	log := logging.New()
+
+	client, err := NewConnectClient(account, timeout, log)
+	s.ErrorIs(err, fs.ErrNotExist)
+	s.Nil(client)
+}
+
+type taskTest struct {
+	task   taskDTO         // The task response from the server
+	nextOp types.Operation // Expected next state
+	err    error           // Expected error
+}
+
+func (s *ConnectClientSuite) TestWaitForTask() {
+	account := &accounts.Account{}
+	timeout := 10 * time.Second
+	log := loggingtest.NewMockLogger()
+
+	str := mock.AnythingOfType("string")
+	anything := mock.Anything
+	log.On("Success", "Done")
+	log.On("Info", str)
+	log.On("Info", str, str, anything)
+
+	expectedPackages := [][]string{
+		{string(installPackage), "wheel", ""},
+		{string(installPackage), "setuptools", ""},
+		{string(installPackage), "pip", ""},
+		{string(downloadPackage), "anyio", "3.6.2"},
+		{string(downloadPackage), "argon2-cffi", "21.3.0"},
+	}
+	for _, pkg := range expectedPackages {
+		log.On("Status",
+			"Package restore",
+			"runtime", pythonRuntime,
+			"status", packageStatus(pkg[0]),
+			"name", pkg[1],
+			"version", pkg[2])
+	}
+	log.On("WithArgs", str, anything).Return(log)
+
+	client, err := NewConnectClient(account, timeout, log)
+	s.NoError(err)
+	taskID := types.TaskID("W3YpnrwUOQJxL5DS")
+
+	tests := []taskTest{
+		{
+			task: taskDTO{
+				Id: taskID,
+				Output: []string{
+					"Building Jupyter notebook...",
+					"Bundle created with Python version 3.11.3 is compatible with environment Local with Python version 3.11.3 from /opt/python/3.11.3/bin/python3.11",
+					"Bundle requested Python version 3.11.3; using /opt/python/3.11.3/bin/python3.11 which has version 3.11.3",
+					"2023/09/12 12:11:28.545506553 [rsc-session] Content GUID: 04f24082-2396-484b-9839-f810891dce95",
+					"2023/09/12 12:11:28.545544671 [rsc-session] Content ID: 24257",
+					"2023/09/12 12:11:28.545552006 [rsc-session] Bundle ID: 41367",
+					"2023/09/12 12:11:28.545557386 [rsc-session] Job Key: W3YpnrwUOQJxL5DS					",
+					"2023/09/12 12:11:28.687716230 Linux distribution: Ubuntu 22.04.2 LTS (jammy)",
+					"2023/09/12 12:11:28.689253595 Running as user: uid=1031(rstudio-connect) gid=999(rstudio-connect) groups=999(rstudio-connect)",
+					"2023/09/12 12:11:28.689266827 Connect version: 2023.08.0-dev+835",
+					"2023/09/12 12:11:28.689299912 LANG: C.UTF-8",
+					"2023/09/12 12:11:28.689301087 Working directory: /opt/rstudio-connect/mnt/app					",
+				},
+				Last: 11,
+			},
+			nextOp: events.PublishRestorePythonEnvOp,
+		},
+		{
+			task: taskDTO{
+				Id: taskID,
+				Output: []string{
+					"2023/09/12 12:11:28.689309426 Building environment using Python 3.11.3 (main, Jun  4 2023, 22:34:28) [GCC 11.3.0] at /opt/python/3.11.3/bin/python3.11",
+					"2023/09/12 12:11:28.704289342 Skipped packages: appnope==0.1.3",
+					"2023/09/12 12:11:28.704310687 Creating environment: AbrY5VfQZ5r97HDk5puHtA",
+					"2023/09/12 12:11:46.700864736 Requirement already satisfied: pip in ./python/env/lib/python3.11/site-packages (22.3.1)",
+					"2023/09/12 12:11:46.985722400 Collecting pip",
+					"2023/09/12 12:11:47.051703423   Using cached pip-23.2.1-py3-none-any.whl (2.1 MB)",
+					"2023/09/12 12:11:47.069280700 Requirement already satisfied: setuptools in ./python/env/lib/python3.11/site-packages (65.5.0)",
+					"2023/09/12 12:11:47.410791493 Collecting setuptools",
+					"2023/09/12 12:11:47.425842304   Using cached setuptools-68.2.1-py3-none-any.whl (807 kB)",
+					"2023/09/12 12:11:47.433729649 Requirement already satisfied: wheel in /opt/python/3.11.3/lib/python3.11/site-packages (0.41.1)",
+					"2023/09/12 12:11:47.487214762 Collecting wheel",
+					"2023/09/12 12:11:47.496886789   Using cached wheel-0.41.2-py3-none-any.whl (64 kB)",
+					"2023/09/12 12:11:47.648418967 Installing collected packages: wheel, setuptools, pip",
+					"2023/09/12 12:11:47.648650446   Attempting uninstall: wheel",
+					"2023/09/12 12:11:47.652986893     Found existing installation: wheel 0.41.1",
+					"2023/09/12 12:11:47.653521318     Not uninstalling wheel at /opt/python/3.11.3/lib/python3.11/site-packages, outside environment /opt/rstudio-connect/mnt/app/python/env",
+					"2023/09/12 12:11:47.653782046     Can't uninstall 'wheel'. No files were found to uninstall.",
+					"2023/09/12 12:11:48.144296856   Attempting uninstall: setuptools",
+					"2023/09/12 12:11:48.149444749     Found existing installation: setuptools 65.5.0",
+					"2023/09/12 12:11:48.550304512     Uninstalling setuptools-65.5.0:",
+					"2023/09/12 12:11:48.944303947       Successfully uninstalled setuptools-65.5.0",
+					"2023/09/12 12:11:53.789270259   Attempting uninstall: pip",
+					"2023/09/12 12:11:53.793350144     Found existing installation: pip 22.3.1",
+					"2023/09/12 12:11:54.663642768     Uninstalling pip-22.3.1:",
+					"2023/09/12 12:11:54.774633341       Successfully uninstalled pip-22.3.1",
+					"2023/09/12 12:12:06.254491799 Successfully installed pip-23.2.1 setuptools-68.2.1 wheel-0.41.2		",
+				},
+				Last: 37,
+			},
+			nextOp: events.PublishRestorePythonEnvOp,
+		},
+		{
+			task: taskDTO{
+				Id: taskID,
+				Output: []string{
+					"2023/09/12 12:12:07.965738756 Collecting anyio==3.6.2 (from -r python/requirements.txt (line 1))",
+					"2023/09/12 12:12:07.975267843   Using cached anyio-3.6.2-py3-none-any.whl (80 kB)",
+					"2023/09/12 12:12:08.083943365 Collecting argon2-cffi==21.3.0 (from -r python/requirements.txt (line 2))",
+					"2023/09/12 12:12:08.100883289   Using cached argon2_cffi-21.3.0-py3-none-any.whl (14 kB)",
+				},
+				Last: 41,
+			},
+			nextOp: events.PublishRestorePythonEnvOp,
+		},
+		{
+			task: taskDTO{
+				Id: taskID,
+				Output: []string{
+					"2023/09/12 12:12:19.773456111 Installing collected packages: anyio, wcwidth, textwrap3, pure-eval, ptyprocess, pickleshare, mistune, ipython-genutils, fastjsonschema, executing, backcall, widgetsnbextension, websocket-client, webcolors, urllib3, uri-template, traitlets, tqdm, tornado, tinycss2, testpath, tenacity, soupsieve, sniffio, six, Send2Trash, rfc3986-validator, pyzmq, PyYAML, python-json-logger, pyrsistent, pyparsing, Pygments, pycparser, psutil, prompt-toolkit, prometheus-client, platformdirs, pexpect, parso, pandocfilters, packaging, nest-asyncio, MarkupSafe, jupyterlab-widgets, jupyterlab-pygments, jsonpointer, idna, fqdn, entrypoints, defusedxml, decorator, debugpy, click, charset-normalizer, certifi, attrs, ansiwrap, terminado, rfc3339-validator, requests, QtPy, python-dateutil, matplotlib-inline, jupyter_core, jsonschema, Jinja2, jedi, comm, cffi, bleach, beautifulsoup4, asttokens, anyio, stack-data, nbformat, jupyter_server_terminals, jupyter_client, arrow, argon2-cffi-bindings, nbclient, isoduration, ipython, argon2-cffi, papermill, nbconvert, ipykernel, qtconsole, jupyter-events, jupyter-console, ipywidgets, jupyter_server, notebook_shim, nbclassic, notebook, jupyter",
+					"2023/09/12 12:13:38.459203951 Successfully installed Jinja2-3.1.2 MarkupSafe-2.1.2 PyYAML-6.0 Pygments-2.15.1 QtPy-2.3.1 Send2Trash-1.8.2 ansiwrap-0.8.4 anyio-3.6.2 argon2-cffi-21.3.0 argon2-cffi-bindings-21.2.0 arrow-1.2.3 asttokens-2.2.1 attrs-23.1.0 backcall-0.2.0 beautifulsoup4-4.12.2 bleach-6.0.0 certifi-2023.7.22 cffi-1.15.1 charset-normalizer-3.2.0 click-8.1.7 comm-0.1.3 debugpy-1.6.7 decorator-5.1.1 defusedxml-0.7.1 entrypoints-0.4 executing-1.2.0 fastjsonschema-2.16.3 fqdn-1.5.1 idna-3.4 ipykernel-6.23.0 ipython-8.13.2 ipython-genutils-0.2.0 ipywidgets-8.0.6 isoduration-20.11.0 jedi-0.18.2 jsonpointer-2.3 jsonschema-4.17.3 jupyter-1.0.0 jupyter-console-6.6.3 jupyter-events-0.6.3 jupyter_client-8.2.0 jupyter_core-5.3.0 jupyter_server-2.5.0 jupyter_server_terminals-0.4.4 jupyterlab-pygments-0.2.2 jupyterlab-widgets-3.0.7 matplotlib-inline-0.1.6 mistune-2.0.5 nbclassic-1.0.0 nbclient-0.7.4 nbconvert-7.4.0 nbformat-5.8.0 nest-asyncio-1.5.6 notebook-6.5.4 notebook_shim-0.2.3 packaging-23.1 pandocfilters-1.5.0 papermill-2.4.0 parso-0.8.3 pexpect-4.8.0 pickleshare-0.7.5 platformdirs-3.5.1 prometheus-client-0.16.0 prompt-toolkit-3.0.38 psutil-5.9.5 ptyprocess-0.7.0 pure-eval-0.2.2 pycparser-2.21 pyparsing-3.0.9 pyrsistent-0.19.3 python-dateutil-2.8.2 python-json-logger-2.0.7 pyzmq-25.0.2 qtconsole-5.4.3 requests-2.31.0 rfc3339-validator-0.1.4 rfc3986-validator-0.1.1 six-1.16.0 sniffio-1.3.0 soupsieve-2.4.1 stack-data-0.6.2 tenacity-8.2.3 terminado-0.17.1 testpath-0.6.0 textwrap3-0.9.2 tinycss2-1.2.1 tornado-6.3.1 tqdm-4.66.1 traitlets-5.9.0 uri-template-1.2.0 urllib3-2.0.4 wcwidth-0.2.6 webcolors-1.13 webencodings-0.5.1 websocket-client-1.5.1 widgetsnbextension-4.0.7",
+					"2023/09/12 12:13:40.684793490 Packages in the environment: ansiwrap==0.8.4, anyio==3.6.2, argon2-cffi==21.3.0, argon2-cffi-bindings==21.2.0, arrow==1.2.3, asttokens==2.2.1, attrs==23.1.0, backcall==0.2.0, beautifulsoup4==4.12.2, bleach==6.0.0, certifi==2023.7.22, cffi==1.15.1, charset-normalizer==3.2.0, click==8.1.7, comm==0.1.3, debugpy==1.6.7, decorator==5.1.1, defusedxml==0.7.1, entrypoints==0.4, executing==1.2.0, fastjsonschema==2.16.3, fqdn==1.5.1, idna==3.4, ipykernel==6.23.0, ipython==8.13.2, ipython-genutils==0.2.0, ipywidgets==8.0.6, isoduration==20.11.0, jedi==0.18.2, Jinja2==3.1.2, jsonpointer==2.3, jsonschema==4.17.3, jupyter==1.0.0, jupyter-console==6.6.3, jupyter-events==0.6.3, jupyter_client==8.2.0, jupyter_core==5.3.0, jupyter_server==2.5.0, jupyter_server_terminals==0.4.4, jupyterlab-pygments==0.2.2, jupyterlab-widgets==3.0.7, MarkupSafe==2.1.2, matplotlib-inline==0.1.6, mistune==2.0.5, nbclassic==1.0.0, nbclient==0.7.4, nbconvert==7.4.0, nbformat==5.8.0, nest-asyncio==1.5.6, notebook==6.5.4, notebook_shim==0.2.3, packaging==23.1, pandocfilters==1.5.0, papermill==2.4.0, parso==0.8.3, pexpect==4.8.0, pickleshare==0.7.5, platformdirs==3.5.1, prometheus-client==0.16.0, prompt-toolkit==3.0.38, psutil==5.9.5, ptyprocess==0.7.0, pure-eval==0.2.2, pycparser==2.21, Pygments==2.15.1, pyparsing==3.0.9, pyrsistent==0.19.3, python-dateutil==2.8.2, python-json-logger==2.0.7, PyYAML==6.0, pyzmq==25.0.2, qtconsole==5.4.3, QtPy==2.3.1, requests==2.31.0, rfc3339-validator==0.1.4, rfc3986-validator==0.1.1, Send2Trash==1.8.2, six==1.16.0, sniffio==1.3.0, soupsieve==2.4.1, stack-data==0.6.2, tenacity==8.2.3, terminado==0.17.1, testpath==0.6.0, textwrap3==0.9.2, tinycss2==1.2.1, tornado==6.3.1, tqdm==4.66.1, traitlets==5.9.0, uri-template==1.2.0, urllib3==2.0.4, wcwidth==0.2.6, webcolors==1.13, webencodings==0.5.1, websocket-client==1.5.1, widgetsnbextension==4.0.7,",
+					"2023/09/12 12:13:40.684844104 Creating kernel spec: python3",
+					"2023/09/12 12:13:42.493712394 0.00s - Debugger warning: It seems that frozen modules are being used, which may",
+					"2023/09/12 12:13:42.493725446 0.00s - make the debugger miss breakpoints. Please pass -Xfrozen_modules=off",
+					"2023/09/12 12:13:42.493763373 0.00s - to python to disable frozen modules.",
+					"2023/09/12 12:13:42.493764977 0.00s - Note: Debugging will proceed. Set PYDEVD_DISABLE_FILE_VALIDATION=1 to disable this validation.",
+					"2023/09/12 12:13:42.787686354 Installed kernelspec python3 in /opt/rstudio-connect/mnt/app/python/env/share/jupyter/kernels/python3",
+					"2023/09/12 12:13:42.994165519 Creating lockfile: python/requirements.txt.lock",
+					"Completed Python build against Python version: '3.11.3'		",
+				},
+				Last: 52,
+			},
+			nextOp: events.PublishRestorePythonEnvOp,
+		},
+		{
+			task: taskDTO{
+				Id: taskID,
+				Output: []string{
+					"Launching Jupyter notebook...",
+					"Using environment Local",
+					"2023/09/12 12:13:44.541508100 [rsc-session] Content GUID: 04f24082-2396-484b-9839-f810891dce95",
+					"2023/09/12 12:13:44.541629598 [rsc-session] Content ID: 24257",
+					"2023/09/12 12:13:44.541635566 [rsc-session] Bundle ID: 41367",
+					"2023/09/12 12:13:44.541639071 [rsc-session] Variant ID: 5921",
+					"2023/09/12 12:13:44.541642353 [rsc-session] Job Key: l6FJXo5Ip5C4jyDf",
+					"2023/09/12 12:13:44.701717371 Running on host: dogfood02",
+					"2023/09/12 12:13:44.713132676 Linux distribution: Ubuntu 22.04.2 LTS (jammy)",
+					"2023/09/12 12:13:44.714771923 Running as user: uid=1031(rstudio-connect) gid=999(rstudio-connect) groups=999(rstudio-connect)",
+					"2023/09/12 12:13:44.714781982 Connect version: 2023.08.0-dev+835",
+					"2023/09/12 12:13:44.714807857 LANG: C.UTF-8",
+					"2023/09/12 12:13:44.714811167 Working directory: /opt/rstudio-connect/mnt/app",
+					"2023/09/12 12:13:44.714819234 Bootstrapping environment using Python 3.11.3 (main, Jun  4 2023, 22:34:28) [GCC 11.3.0] at /opt/python/3.11.3/bin/python3.11",
+					"2023/09/12 12:13:44.716751212 Running content with the Python virtual environment /opt/rstudio-connect/mnt/app/python/env (/opt/rstudio-connect/mnt/python-environments/pip/3.11.3/AbrY5VfQZ5r97HDk5puHtA)				},",
+				},
+				Last: 67,
+			},
+			nextOp: events.PublishRunContentOp,
+		},
+	}
+	op := events.AgentOp
+	for _, test := range tests {
+		op, err = client.handleTaskUpdate(&test.task, op, log)
+		if test.err != nil {
+			s.ErrorIs(err, test.err)
+		} else {
+			s.NoError(err)
+		}
+		s.Equal(test.nextOp, op)
+	}
+	log.AssertExpectations(s.T())
+}
diff --git a/internal/api_client/clients/http_client.go b/internal/api_client/clients/http_client.go
index 1c7f562ec..1d346c3da 100644
--- a/internal/api_client/clients/http_client.go
+++ b/internal/api_client/clients/http_client.go
@@ -183,7 +183,7 @@ func loadCACertificates(path string, log logging.Logger) (*x509.CertPool, error)
 	log.Info("Loading CA certificate", "path", path)
 	certificate, err := os.ReadFile(path)
 	if err != nil {
-		return nil, fmt.Errorf("Error reading certificate file: %s", err)
+		return nil, fmt.Errorf("Error reading certificate file: %w", err)
 	}
 	certPool := x509.NewCertPool()
 	ok := certPool.AppendCertsFromPEM(certificate)
diff --git a/internal/bundles/bundle.go b/internal/bundles/bundle.go
index d10e7e38f..d60de5450 100644
--- a/internal/bundles/bundle.go
+++ b/internal/bundles/bundle.go
@@ -227,7 +227,7 @@ func (b *bundle) walkFunc(path util.Path, info fs.FileInfo, err error) error {
 	if err != nil {
 		return err
 	}
-	pathLogger := b.log.With(
+	pathLogger := b.log.WithArgs(
 		"path", path,
 		"size", info.Size(),
 	)
diff --git a/internal/logging/logger.go b/internal/logging/logger.go
index ceee531ea..3142612ed 100644
--- a/internal/logging/logger.go
+++ b/internal/logging/logger.go
@@ -28,37 +28,47 @@ const (
 	LogKeyErrCode = "error_code"
 )
 
-type Logger struct {
+type Logger interface {
 	BaseLogger
+	Start(msg string, args ...any)
+	Success(msg string, args ...any)
+	Status(msg string, args ...any)
+	Progress(msg string, done float32, total float32, args ...any)
+	Failure(err error)
+	WithArgs(args ...any) Logger
 }
 
-func New() Logger {
-	return Logger{
+type loggerImpl struct {
+	BaseLogger
+}
+
+func New() loggerImpl {
+	return loggerImpl{
 		slog.Default(),
 	}
 }
 
-func FromStdLogger(log *slog.Logger) Logger {
-	return Logger{log}
+func FromStdLogger(log *slog.Logger) loggerImpl {
+	return loggerImpl{log}
 }
 
-func (l Logger) Start(msg string, args ...any) {
+func (l loggerImpl) Start(msg string, args ...any) {
 	l.Info(msg, append([]any{LogKeyPhase, StartPhase}, args...)...)
 }
 
-func (l Logger) Success(msg string, args ...any) {
+func (l loggerImpl) Success(msg string, args ...any) {
 	l.Info(msg, append([]any{LogKeyPhase, SuccessPhase}, args...)...)
 }
 
-func (l Logger) Status(msg string, args ...any) {
+func (l loggerImpl) Status(msg string, args ...any) {
 	l.Info(msg, append([]any{LogKeyPhase, ProgressPhase}, args...)...)
 }
 
-func (l Logger) Progress(msg string, done float32, total float32, args ...any) {
+func (l loggerImpl) Progress(msg string, done float32, total float32, args ...any) {
 	l.Info(msg, append([]any{LogKeyPhase, ProgressPhase, "done", done, "total", total}, args...)...)
 }
 
-func (l Logger) Failure(err error) {
+func (l loggerImpl) Failure(err error) {
 	if agentError, ok := err.(types.EventableError); ok {
 		args := []any{
 			LogKeyOp, agentError.GetOperation(),
@@ -73,11 +83,11 @@ func (l Logger) Failure(err error) {
 		// We shouldn't get here, because callers who use Failure
 		// (the Publish routine) will wrap all errors in AgentErrors.
 		// But just in case, log it anyway.
-		l.Debug("Received a non-eventable error in Logger.Failure; see the following error entry")
+		l.Debug("Received a non-eventable error in LoggerImpl.Failure; see the following error entry")
 		l.Error(err.Error(), LogKeyPhase, FailurePhase)
 	}
 }
 
-func (l Logger) With(args ...any) Logger {
-	return Logger{l.BaseLogger.With(args...)}
+func (l loggerImpl) WithArgs(args ...any) Logger {
+	return loggerImpl{l.BaseLogger.With(args...)}
 }
diff --git a/internal/logging/logger_test.go b/internal/logging/logger_test.go
index 3d3ebb9e2..48a02c6f1 100644
--- a/internal/logging/logger_test.go
+++ b/internal/logging/logger_test.go
@@ -7,7 +7,6 @@ import (
 	"log/slog"
 	"testing"
 
-	"github.com/rstudio/connect-client/internal/logging/loggingtest"
 	"github.com/rstudio/connect-client/internal/types"
 	"github.com/rstudio/connect-client/internal/util/utiltest"
 	"github.com/stretchr/testify/mock"
@@ -35,34 +34,34 @@ func (s *LoggingSuite) TestFromStdLogger() {
 }
 
 func (s *LoggingSuite) TestStart() {
-	baseLogger := loggingtest.NewMockLogger()
+	baseLogger := NewMockBaseLogger()
 	baseLogger.On("Info", "message", LogKeyPhase, StartPhase, "arg", "value")
 
-	log := Logger{baseLogger}
+	log := loggerImpl{baseLogger}
 	log.Start("message", "arg", "value")
-	s.Assert()
+	baseLogger.AssertExpectations(s.T())
 }
 
 func (s *LoggingSuite) TestSuccess() {
-	baseLogger := loggingtest.NewMockLogger()
+	baseLogger := NewMockBaseLogger()
 	baseLogger.On("Info", "message", LogKeyPhase, SuccessPhase, "arg", "value")
 
-	log := Logger{baseLogger}
+	log := loggerImpl{baseLogger}
 	log.Success("message", "arg", "value")
-	s.Assert()
+	baseLogger.AssertExpectations(s.T())
 }
 
 func (s *LoggingSuite) TestStatus() {
-	baseLogger := loggingtest.NewMockLogger()
+	baseLogger := NewMockBaseLogger()
 	baseLogger.On("Info", "message", LogKeyPhase, ProgressPhase, "arg", "value")
 
-	log := Logger{baseLogger}
+	log := loggerImpl{baseLogger}
 	log.Status("message", "arg", "value")
-	s.Assert()
+	baseLogger.AssertExpectations(s.T())
 }
 
 func (s *LoggingSuite) TestProgress() {
-	baseLogger := loggingtest.NewMockLogger()
+	baseLogger := NewMockBaseLogger()
 	baseLogger.On(
 		"Info", "message",
 		LogKeyPhase, ProgressPhase,
@@ -70,24 +69,24 @@ func (s *LoggingSuite) TestProgress() {
 		"total", float32(100),
 		"arg", "value")
 
-	log := Logger{baseLogger}
+	log := loggerImpl{baseLogger}
 	log.Progress("message", 20, 100, "arg", "value")
-	s.Assert()
+	baseLogger.AssertExpectations(s.T())
 }
 
 func (s *LoggingSuite) TestFailureGoError() {
-	baseLogger := loggingtest.NewMockLogger()
+	baseLogger := NewMockBaseLogger()
 	baseLogger.On("Error", "test error", LogKeyPhase, FailurePhase)
 	baseLogger.On("Debug", mock.AnythingOfType("string"))
 
-	log := Logger{baseLogger}
+	log := loggerImpl{baseLogger}
 	err := errors.New("test error")
 	log.Failure(err)
-	s.Assert()
+	baseLogger.AssertExpectations(s.T())
 }
 
 func (s *LoggingSuite) TestFailureAgentError() {
-	baseLogger := loggingtest.NewMockLogger()
+	baseLogger := NewMockBaseLogger()
 	op := types.Operation("testOp")
 
 	baseLogger.On(
@@ -97,7 +96,7 @@ func (s *LoggingSuite) TestFailureAgentError() {
 		LogKeyErrCode, types.UnknownErrorCode,
 		"Metadata", "some metadata")
 
-	log := Logger{baseLogger}
+	log := loggerImpl{baseLogger}
 	baseErr := errors.New("test error")
 	errData := struct {
 		Metadata string
@@ -105,14 +104,14 @@ func (s *LoggingSuite) TestFailureAgentError() {
 	err := types.NewAgentError(types.UnknownErrorCode, baseErr, &errData)
 	err.SetOperation(op)
 	log.Failure(err)
-	s.Assert()
+	baseLogger.AssertExpectations(s.T())
 }
 
 func (s *LoggingSuite) TestWith() {
-	baseLogger := loggingtest.NewMockLogger()
+	baseLogger := NewMockBaseLogger()
 	expectedLogger := slog.Default()
 	baseLogger.On("With", "arg", "value", "arg2", "value2").Return(expectedLogger)
-	log := Logger{baseLogger}
-	actualLogger := log.With("arg", "value", "arg2", "value2")
-	s.Equal(Logger{expectedLogger}, actualLogger)
+	log := loggerImpl{baseLogger}
+	actualLogger := log.WithArgs("arg", "value", "arg2", "value2")
+	s.Equal(loggerImpl{expectedLogger}, actualLogger)
 }
diff --git a/internal/logging/loggingtest/mock_logger.go b/internal/logging/loggingtest/mock_logger.go
index 01fd82d73..85828400e 100644
--- a/internal/logging/loggingtest/mock_logger.go
+++ b/internal/logging/loggingtest/mock_logger.go
@@ -3,61 +3,42 @@ package loggingtest
 // Copyright (C) 2023 by Posit Software, PBC.
 
 import (
-	"context"
-	"log/slog"
-
-	"github.com/stretchr/testify/mock"
+	"github.com/rstudio/connect-client/internal/logging"
 )
 
 type MockLogger struct {
-	mock.Mock
+	logging.MockBaseLogger
 }
 
 func NewMockLogger() *MockLogger {
 	return &MockLogger{}
 }
 
-func (m *MockLogger) Error(msg string, args ...any) {
-	mockArgs := append([]any{msg}, args...)
-	m.Called(mockArgs...)
-}
-
-func (m *MockLogger) Warn(msg string, args ...any) {
+func (m *MockLogger) Start(msg string, args ...any) {
 	mockArgs := append([]any{msg}, args...)
 	m.Called(mockArgs...)
 }
 
-func (m *MockLogger) Info(msg string, args ...any) {
+func (m *MockLogger) Success(msg string, args ...any) {
 	mockArgs := append([]any{msg}, args...)
 	m.Called(mockArgs...)
 }
 
-func (m *MockLogger) Debug(msg string, args ...any) {
+func (m *MockLogger) Status(msg string, args ...any) {
 	mockArgs := append([]any{msg}, args...)
 	m.Called(mockArgs...)
 }
 
-func (m *MockLogger) Log(ctx context.Context, level slog.Level, msg string, args ...any) {
-	mockArgs := append([]any{ctx, level, msg}, args...)
+func (m *MockLogger) Progress(msg string, done float32, total float32, args ...any) {
+	mockArgs := append([]any{msg, done, total}, args...)
 	m.Called(mockArgs...)
 }
 
-func (m *MockLogger) Handler() slog.Handler {
-	mockArgs := m.Called()
-	return mockArgs.Get(0).(slog.Handler)
+func (m *MockLogger) Failure(err error) {
+	m.Called(err)
 }
 
-func (m *MockLogger) Enabled(ctx context.Context, level slog.Level) bool {
-	args := m.Called(ctx, level)
-	return args.Bool(0)
-}
-
-func (m *MockLogger) With(args ...any) *slog.Logger {
+func (m *MockLogger) WithArgs(args ...any) logging.Logger {
 	mockArgs := m.Called(args...)
-	return mockArgs.Get(0).(*slog.Logger)
-}
-
-func (m *MockLogger) WithGroup(name string) *slog.Logger {
-	mockArgs := m.Called(name)
-	return mockArgs.Get(0).(*slog.Logger)
+	return mockArgs.Get(0).(logging.Logger)
 }
diff --git a/internal/logging/mock_base_logger.go b/internal/logging/mock_base_logger.go
new file mode 100644
index 000000000..569601d5c
--- /dev/null
+++ b/internal/logging/mock_base_logger.go
@@ -0,0 +1,63 @@
+package logging
+
+// Copyright (C) 2023 by Posit Software, PBC.
+
+import (
+	"context"
+	"log/slog"
+
+	"github.com/stretchr/testify/mock"
+)
+
+type MockBaseLogger struct {
+	mock.Mock
+}
+
+func NewMockBaseLogger() *MockBaseLogger {
+	return &MockBaseLogger{}
+}
+
+func (m *MockBaseLogger) Error(msg string, args ...any) {
+	mockArgs := append([]any{msg}, args...)
+	m.Called(mockArgs...)
+}
+
+func (m *MockBaseLogger) Warn(msg string, args ...any) {
+	mockArgs := append([]any{msg}, args...)
+	m.Called(mockArgs...)
+}
+
+func (m *MockBaseLogger) Info(msg string, args ...any) {
+	mockArgs := append([]any{msg}, args...)
+	m.Called(mockArgs...)
+}
+
+func (m *MockBaseLogger) Debug(msg string, args ...any) {
+	mockArgs := append([]any{msg}, args...)
+	m.Called(mockArgs...)
+}
+
+func (m *MockBaseLogger) Log(ctx context.Context, level slog.Level, msg string, args ...any) {
+	mockArgs := append([]any{ctx, level, msg}, args...)
+	m.Called(mockArgs...)
+}
+
+func (m *MockBaseLogger) Handler() slog.Handler {
+	mockArgs := m.Called()
+	return mockArgs.Get(0).(slog.Handler)
+}
+
+func (m *MockBaseLogger) Enabled(ctx context.Context, level slog.Level) bool {
+	args := m.Called(ctx, level)
+	return args.Bool(0)
+}
+
+func (m *MockBaseLogger) With(args ...any) *slog.Logger {
+	mockArgs := m.Called(args...)
+	return mockArgs.Get(0).(*slog.Logger)
+}
+
+func (m *MockBaseLogger) WithGroup(name string) *slog.Logger {
+	mockArgs := m.Called(name)
+	return mockArgs.Get(0).(*slog.Logger)
+}
diff --git a/internal/logging/loggingtest/mock_handler.go b/internal/logging/mock_handler.go
similarity index 97%
rename from internal/logging/loggingtest/mock_handler.go
rename to internal/logging/mock_handler.go
index d65d26082..bc16ca9cf 100644
--- a/internal/logging/loggingtest/mock_handler.go
+++ b/internal/logging/mock_handler.go
@@ -1,4 +1,4 @@
-package loggingtest
+package logging
 
 // Copyright (C) 2023 by Posit Software, PBC.
 
diff --git a/internal/logging/multi_handler_test.go b/internal/logging/multi_handler_test.go
index d28c8f8e3..0941c681a 100644
--- a/internal/logging/multi_handler_test.go
+++ b/internal/logging/multi_handler_test.go
@@ -9,7 +9,6 @@ import (
 	"os"
 	"testing"
 
-	"github.com/rstudio/connect-client/internal/logging/loggingtest"
 	"github.com/rstudio/connect-client/internal/util/utiltest"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
@@ -24,8 +23,8 @@ func TestMultiHanlderSuite(t *testing.T) {
 }
 
 func (s *MultiHandlerSuite) TestNewMultiHandler() {
-	h1 := loggingtest.NewMockHandler()
-	h2 := loggingtest.NewMockHandler()
+	h1 := NewMockHandler()
+	h2 := NewMockHandler()
 
 	multiHandler := NewMultiHandler(h1, h2)
 	s.Equal([]slog.Handler{h1, h2}, multiHandler.handlers)
@@ -44,8 +43,8 @@ func (s *MultiHandlerSuite) TestEnabled() {
 }
 
 func (s *MultiHandlerSuite) TestHandle() {
-	h1 := loggingtest.NewMockHandler()
-	h2 := loggingtest.NewMockHandler()
+	h1 := NewMockHandler()
+	h2 := NewMockHandler()
 
 	h1.On("Enabled", mock.Anything, slog.LevelInfo).Return(true)
 	h2.On("Enabled", mock.Anything, slog.LevelInfo).Return(false)
@@ -57,11 +56,12 @@ func (s *MultiHandlerSuite) TestHandle() {
 		Message: "message",
 	}
 	multiHandler.Handle(context.Background(), record)
-	s.Assert()
+	h1.AssertExpectations(s.T())
+	h2.AssertExpectations(s.T())
 }
 
 func (s *MultiHandlerSuite) TestHandleError() {
-	baseHandler := loggingtest.NewMockHandler()
+	baseHandler := NewMockHandler()
 	testError := errors.New("test error from Handle")
 	baseHandler.On("Enabled", mock.Anything, slog.LevelInfo).Return(true)
 	baseHandler.On("Handle", mock.Anything, mock.Anything).Return(testError)
@@ -73,14 +73,14 @@ func (s *MultiHandlerSuite) TestHandleError() {
 	}
 	err := multiHandler.Handle(context.Background(), record)
 	s.ErrorIs(err, testError)
-	s.Assert()
+	baseHandler.AssertExpectations(s.T())
 }
 
 func (s *MultiHandlerSuite) TestWithAttrs() {
-	h1 := loggingtest.NewMockHandler()
-	h2 := loggingtest.NewMockHandler()
-	h1WithAttrs := loggingtest.NewMockHandler()
-	h2WithAttrs := loggingtest.NewMockHandler()
+	h1 := NewMockHandler()
+	h2 := NewMockHandler()
+	h1WithAttrs := NewMockHandler()
+	h2WithAttrs := NewMockHandler()
 
 	attr := slog.Attr{
 		Key:   "att",
@@ -93,27 +93,29 @@ func (s *MultiHandlerSuite) TestWithAttrs() {
 	multiHandler := NewMultiHandler(h1, h2)
 	returnedHandler := multiHandler.WithAttrs(attrs)
 	s.Equal(NewMultiHandler(h1WithAttrs, h2WithAttrs), returnedHandler)
-	s.Assert()
+	h1.AssertExpectations(s.T())
+	h2.AssertExpectations(s.T())
 }
 
 func (s *MultiHandlerSuite) TestWithGroup() {
-	h1 := loggingtest.NewMockHandler()
-	h2 := loggingtest.NewMockHandler()
-	h1WithGroup := loggingtest.NewMockHandler()
-	h2WithGroup := loggingtest.NewMockHandler()
+	h1 := NewMockHandler()
+	h2 := NewMockHandler()
+	h1WithGroup := NewMockHandler()
+	h2WithGroup := NewMockHandler()
 	h1.On("WithGroup", "group").Return(h1WithGroup)
 	h2.On("WithGroup", "group").Return(h2WithGroup)
 
 	multiHandler := NewMultiHandler(h1, h2)
 	returnedHandler := multiHandler.WithGroup("group")
 	s.Equal(NewMultiHandler(h1WithGroup, h2WithGroup), returnedHandler)
-	s.Assert()
+	h1.AssertExpectations(s.T())
+	h2.AssertExpectations(s.T())
 }
 
 func (s *MultiHandlerSuite) TestWithGroupEmptyName() {
-	baseHandler := loggingtest.NewMockHandler()
+	baseHandler := NewMockHandler()
 	multiHandler := NewMultiHandler(baseHandler)
 	returnedHandler := multiHandler.WithGroup("")
 	s.Equal(multiHandler, returnedHandler)
-	s.Assert()
+	baseHandler.AssertExpectations(s.T())
 }
diff --git a/internal/publish/publish.go b/internal/publish/publish.go
index 1ed1f6332..736c179d3 100644
--- a/internal/publish/publish.go
+++ b/internal/publish/publish.go
@@ -67,7 +67,7 @@ func logAppInfo(accountURL string, contentID types.ContentID, log logging.Logger
 		DashboardURL: fmt.Sprintf("%s/connect/#/apps/%s", accountURL, contentID),
 		DirectURL:    fmt.Sprintf("%s/content/%s", accountURL, contentID),
 	}
-	log.With(
+	log.WithArgs(
 		"dashboardURL", appInfo.DashboardURL,
 		"directURL", appInfo.DirectURL,
 		"serverURL", accountURL,
@@ -121,7 +121,7 @@ type DeploymentNotFoundDetails struct {
 }
 
 func withLog[T any](op events.Operation, msg string, label string, log logging.Logger, fn func() (T, error)) (value T, err error) {
-	log = log.With(logging.LogKeyOp, op)
+	log = log.WithArgs(logging.LogKeyOp, op)
 	log.Start(msg)
 	value, err = fn()
 	if err != nil {
@@ -206,11 +206,11 @@ func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, acco
 		return err
 	}
 
-	taskLogger := log.With("source", "serverLog")
+	taskLogger := log.WithArgs("source", "serverLog")
 	err = client.WaitForTask(taskID, taskLogger)
 	if err != nil {
 		return err
 	}
-	log = log.With(logging.LogKeyOp, events.AgentOp)
+	log = log.WithArgs(logging.LogKeyOp, events.AgentOp)
 	return logAppInfo(account.URL, contentID, log)
 }
diff --git a/internal/services/middleware/log_request.go b/internal/services/middleware/log_request.go
index b90a20b91..2e0172ce0 100644
--- a/internal/services/middleware/log_request.go
+++ b/internal/services/middleware/log_request.go
@@ -51,7 +51,7 @@ func LogRequest(msg string, log logging.Logger, next http.HandlerFunc) http.Hand
 		next(writer, req)
 		elapsedMs := time.Since(startTime).Milliseconds()
 
-		fieldLogger := log.With(
+		fieldLogger := log.WithArgs(
 			"method", req.Method,
 			"url", req.URL.String(),
 			"elapsed_ms", elapsedMs,
@@ -62,7 +62,7 @@ func LogRequest(msg string, log logging.Logger, next http.HandlerFunc) http.Hand
 		)
 		correlationId := writer.Header().Get("X-Correlation-Id")
 		if correlationId != "" {
-			fieldLogger = fieldLogger.With("X-Correlation-Id", correlationId)
+			fieldLogger = fieldLogger.WithArgs("X-Correlation-Id", correlationId)
 		}
 		fieldLogger.Info(msg)
 	}
diff --git a/internal/services/proxy/http_proxy.go b/internal/services/proxy/http_proxy.go
index 76d7aee56..942cc3407 100644
--- a/internal/services/proxy/http_proxy.go
+++ b/internal/services/proxy/http_proxy.go
@@ -139,7 +139,7 @@ func (p *proxy) logHeader(msg string, header http.Header) {
 				value = fmt.Sprintf("%v", values)
 			}
 		}
-		log = log.With(headerName(name), value)
+		log = log.WithArgs(headerName(name), value)
 	}
 	log.Debug(msg)
 }

From f0f3706d698ea7b1838033de52a6d330f4ef2f9d Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Tue, 12 Sep 2023 16:06:47 -0400
Subject: [PATCH 09/33] more tests

---
 internal/api_client/clients/client_connect.go |  35 +++--
 .../api_client/clients/client_connect_test.go | 141 +++++++++++++++---
 2 files changed, 142 insertions(+), 34 deletions(-)

diff --git a/internal/api_client/clients/client_connect.go b/internal/api_client/clients/client_connect.go
index c6754d416..29d3b4156 100644
--- a/internal/api_client/clients/client_connect.go
+++ b/internal/api_client/clients/client_connect.go
@@ -9,6 +9,7 @@ import (
 	"io"
 	"net/http"
 	"regexp"
+	"strings"
 	"time"
 
 	"github.com/rstudio/connect-client/internal/accounts"
@@ -247,23 +248,30 @@ var launchPattern = regexp.MustCompile("Launching .* (application|API|notebook)"
 var staticPattern = regexp.MustCompile("(Building|Launching) static content")
 
 func eventOpFromLogLine(currentOp events.Operation, line string) events.Operation {
-	if match := buildRPattern.MatchString(line); match {
+	match := buildRPattern.MatchString(line)
+	if match || strings.Contains(line, "Bundle created with R version") {
 		return events.PublishRestoreREnvOp
-	} else if match := buildPythonPattern.MatchString(line); match {
+	}
+	match = buildPythonPattern.MatchString(line)
+	if match || strings.Contains(line, "Bundle requested Python version") {
 		return events.PublishRestorePythonEnvOp
-	} else if match := launchPattern.MatchString(line); match {
+	}
+	match = launchPattern.MatchString(line)
+	if match {
 		return events.PublishRunContentOp
-	} else if match := staticPattern.MatchString(line); match {
+	}
+	match = staticPattern.MatchString(line)
+	if match {
 		return events.PublishRunContentOp
 	}
 	return currentOp
 }
 
-type runtime string
+type packageRuntime string
 
 const (
-	rRuntime      runtime = "r"
-	pythonRuntime runtime = "python"
+	rRuntime      packageRuntime = "r"
+	pythonRuntime packageRuntime = "python"
 )
 
 type packageStatus string
@@ -274,19 +282,18 @@ const (
 	installPackage            packageStatus = "install"
 )
 
-var rPackagePattern = regexp.MustCompile(`Installing ([[:word:]\.]+) (\(\S+\)) ...`)
-var pythonDownloadingPackagePattern = regexp.MustCompile(`Downloading (\S+)-(\S+)-`)
+var rPackagePattern = regexp.MustCompile(`Installing ([[:word:]\.]+) \((\S+)\) ...`)
 var pythonCollectingPackagePattern = regexp.MustCompile(`Collecting (\S+)==(\S+)`)
 var pythonInstallingPackagePattern = regexp.MustCompile(`Found existing installation: (\S+) ()\S+`)
 
 type packageEvent struct {
-	runtime runtime
+	runtime packageRuntime
 	status  packageStatus
 	name    string
 	version string
 }
 
-func makePackageEvent(match []string, rt runtime, status packageStatus) *packageEvent {
+func makePackageEvent(match []string, rt packageRuntime, status packageStatus) *packageEvent {
 	return &packageEvent{
 		runtime: rt,
 		status:  status,
@@ -298,8 +305,6 @@ func makePackageEvent(match []string, rt runtime, status packageStatus) *package
 func packageEventFromLogLine(line string) *packageEvent {
 	if match := rPackagePattern.FindStringSubmatch(line); match != nil {
 		return makePackageEvent(match, rRuntime, downloadAndInstallPackage)
-	} else if match := pythonDownloadingPackagePattern.FindStringSubmatch(line); match != nil {
-		return makePackageEvent(match, pythonRuntime, downloadPackage)
 	} else if match := pythonCollectingPackagePattern.FindStringSubmatch(line); match != nil {
 		return makePackageEvent(match, pythonRuntime, downloadPackage)
 	} else if match := pythonInstallingPackagePattern.FindStringSubmatch(line); match != nil {
@@ -308,7 +313,7 @@ func packageEventFromLogLine(line string) *packageEvent {
 	return nil
 }
 
-func (c *ConnectClient) handleTaskUpdate(task *taskDTO, op types.Operation, log logging.Logger) (types.Operation, error) {
+func handleTaskUpdate(task *taskDTO, op types.Operation, log logging.Logger) (types.Operation, error) {
 	var nextOp types.Operation
 
 	for _, line := range task.Output {
@@ -354,7 +359,7 @@ func (c *ConnectClient) WaitForTask(taskID types.TaskID, log logging.Logger) err
 		if err != nil {
 			return err
 		}
-		op, err = c.handleTaskUpdate(task, op, log)
+		op, err = handleTaskUpdate(task, op, log)
 		if task.Finished {
 			return err
 		}
diff --git a/internal/api_client/clients/client_connect_test.go b/internal/api_client/clients/client_connect_test.go
index d25bceda8..ebf143548 100644
--- a/internal/api_client/clients/client_connect_test.go
+++ b/internal/api_client/clients/client_connect_test.go
@@ -3,6 +3,7 @@ package clients
 // Copyright (C) 2023 by Posit Software, PBC.
 
 import (
+	"errors"
 	"io/fs"
 	"testing"
 	"time"
@@ -56,8 +57,6 @@ type taskTest struct {
 }
 
 func (s *ConnectClientSuite) TestWaitForTask() {
-	account := &accounts.Account{}
-	timeout := 10 * time.Second
 	log := loggingtest.NewMockLogger()
 
 	str := mock.AnythingOfType("string")
@@ -66,25 +65,29 @@ func (s *ConnectClientSuite) TestWaitForTask() {
 	log.On("Info", str)
 	log.On("Info", str, str, anything)
 
-	expectedPackages := [][]string{
-		{string(installPackage), "wheel", ""},
-		{string(installPackage), "setuptools", ""},
-		{string(installPackage), "pip", ""},
-		{string(downloadPackage), "anyio", "3.6.2"},
-		{string(downloadPackage), "argon2-cffi", "21.3.0"},
+	expectedPackages := []struct {
+		rt      packageRuntime
+		status  packageStatus
+		name    string
+		version string
+	}{
+		{pythonRuntime, installPackage, "wheel", ""},
+		{pythonRuntime, installPackage, "setuptools", ""},
+		{pythonRuntime, installPackage, "pip", ""},
+		{pythonRuntime, downloadPackage, "anyio", "3.6.2"},
+		{pythonRuntime, downloadPackage, "argon2-cffi", "21.3.0"},
+		{rRuntime, downloadAndInstallPackage, "R6", "2.5.1"},
+		{rRuntime, downloadAndInstallPackage, "Rcpp", "1.0.10"},
 	}
 	for _, pkg := range expectedPackages {
 		log.On("Status",
 			"Package restore",
-			"runtime", pythonRuntime,
-			"status", packageStatus(pkg[0]),
-			"name", pkg[1],
-			"version", pkg[2])
+			"runtime", pkg.rt,
+			"status", pkg.status,
+			"name", pkg.name,
+			"version", pkg.version)
 	}
 	log.On("WithArgs", str, anything).Return(log)
-
-	client, err := NewConnectClient(account, timeout, log)
-	s.NoError(err)
 	taskID := types.TaskID("W3YpnrwUOQJxL5DS")
 
 	tests := []taskTest{
@@ -153,7 +156,7 @@ func (s *ConnectClientSuite) TestWaitForTask() {
 					"2023/09/12 12:12:08.083943365 Collecting argon2-cffi==21.3.0 (from -r python/requirements.txt (line 2))",
 					"2023/09/12 12:12:08.100883289   Using cached argon2_cffi-21.3.0-py3-none-any.whl (14 kB)",
 				},
-				Last: 41,
+				Last: 43,
 			},
 			nextOp: events.PublishRestorePythonEnvOp,
 		},
@@ -173,11 +176,13 @@ func (s *ConnectClientSuite) TestWaitForTask() {
 					"2023/09/12 12:13:42.994165519 Creating lockfile: python/requirements.txt.lock",
 					"Completed Python build against Python version: '3.11.3'		",
 				},
-				Last: 52,
+				Last: 54,
 			},
 			nextOp: events.PublishRestorePythonEnvOp,
 		},
 		{
+			// This doesn't really make sense to come next,
+			// in fact it is from a different log, but here it is anyway.
 			task: taskDTO{
 				Id: taskID,
 				Output: []string{
@@ -197,14 +202,77 @@ func (s *ConnectClientSuite) TestWaitForTask() {
 					"2023/09/12 12:13:44.714819234 Bootstrapping environment using Python 3.11.3 (main, Jun  4 2023, 22:34:28) [GCC 11.3.0] at /opt/python/3.11.3/bin/python3.11",
 					"2023/09/12 12:13:44.716751212 Running content with the Python virtual environment /opt/rstudio-connect/mnt/app/python/env (/opt/rstudio-connect/mnt/python-environments/pip/3.11.3/AbrY5VfQZ5r97HDk5puHtA)				},",
 				},
-				Last: 67,
+				Finished: true,
+				Last:     69,
 			},
 			nextOp: events.PublishRunContentOp,
 		},
+
+		{
+			task: taskDTO{
+				Id: taskID,
+				Output: []string{
+					"Bundle created with R version 4.3.0, Python version 3.11.3, and Quarto version 0.9.105 is compatible with environment Local with R version 4.3.1 from /opt/R/4.3.1/bin/R, Python version 3.11.3 from /opt/python/3.11.3/bin/python3.11, and Quarto version 1.3.450 from /opt/quarto/1.3.450/bin/quarto",
+					"Bundle requested R version 4.3.0; using /opt/R/4.3.1/bin/R which has version 4.3.1",
+					"Performing manifest.json to packrat transformation.",
+					"Rewriting .Rprofile to disable renv activation.",
+					"2023/09/12 17:02:42.966434822 [rsc-session] Content GUID: 067f9077-b831-4cff-bcd2-ee0797f27cb8",
+					"2023/09/12 17:02:42.966484486 [rsc-session] Content ID: 24275",
+					"2023/09/12 17:02:42.966491187 [rsc-session] Bundle ID: 41387",
+					"2023/09/12 17:02:42.966495586 [rsc-session] Job Key: MjLGWJMm4mkQCxRo",
+					"2023/09/12 17:02:44.214759306 Running on host: dogfood01",
+					"2023/09/12 17:02:44.240099958 Linux distribution: Ubuntu 22.04.2 LTS (jammy)",
+					"2023/09/12 17:02:44.243027005 Running as user: uid=1031(rstudio-connect) gid=999(rstudio-connect) groups=999(rstudio-connect)",
+					"2023/09/12 17:02:44.243096083 Connect version: 2023.08.0-dev+835",
+					"2023/09/12 17:02:44.243134910 LANG: C.UTF-8",
+					"2023/09/12 17:02:44.243454938 Working directory: /opt/rstudio-connect/mnt/app",
+					"2023/09/12 17:02:44.243650732 Using R 4.3.1",
+					"2023/09/12 17:02:44.243656003 R.home(): /opt/R/4.3.1/lib/R",
+					"2023/09/12 17:02:44.244676467 Using user agent string: 'RStudio R (4.3.1 x86_64-pc-linux-gnu x86_64 linux-gnu)'",
+					"2023/09/12 17:02:44.245211912 # Validating R library read / write permissions --------------------------------",
+					"2023/09/12 17:02:44.249695973 Using R library for packrat bootstrap: /opt/rstudio-connect/mnt/R/4.3.1",
+					"2023/09/12 17:02:44.250108685 # Validating managed packrat installation --------------------------------------",
+					"2023/09/12 17:02:44.250391017 Vendored packrat archive: /opt/rstudio-connect/ext/R/packrat_0.9.1-1_ac6bc33bce3869513cbe1ce14a697dfa807d9c41.tar.gz",
+					"2023/09/12 17:02:44.262948547 Vendored packrat SHA: ac6bc33bce3869513cbe1ce14a697dfa807d9c41",
+					"2023/09/12 17:02:44.276923165 Managed packrat SHA:  ac6bc33bce3869513cbe1ce14a697dfa807d9c41",
+					"2023/09/12 17:02:44.278612673 Managed packrat version: 0.9.1.1",
+					"2023/09/12 17:02:44.279320329 Managed packrat is up-to-date.",
+					"2023/09/12 17:02:44.279664142 # Validating packrat cache read / write permissions ----------------------------",
+					"2023/09/12 17:02:44.643930307 Using packrat cache directory: /opt/rstudio-connect/mnt/packrat/4.3.1",
+					"2023/09/12 17:02:44.644104262 # Setting packrat options and preparing lockfile -------------------------------",
+					"2023/09/12 17:02:44.807459260 Audited package hashes with local packrat installation.",
+					"2023/09/12 17:02:44.809608665 # Resolving R package repositories ---------------------------------------------",
+					"2023/09/12 17:02:44.827081713 Received repositories from Connect's configuration:",
+					`2023/09/12 17:02:44.827696151 - CRAN = "https://packagemanager.posit.co/cran/__linux__/jammy/latest"`,
+					`2023/09/12 17:02:44.827703834 - RSPM = "https://packagemanager.posit.co/cran/__linux__/jammy/latest"`,
+					"2023/09/12 17:02:45.034481466 Received repositories from published content:",
+					`2023/09/12 17:02:45.036517369 - CRAN = "https://cran.rstudio.com"`,
+					"2023/09/12 17:02:45.041604661 Combining repositories from configuration and content.",
+					"2023/09/12 17:02:45.041811490 Packages will be installed using the following repositories:",
+					`2023/09/12 17:02:45.042593774 - CRAN = "https://packagemanager.posit.co/cran/__linux__/jammy/latest"`,
+					`2023/09/12 17:02:45.042601638 - RSPM = "https://packagemanager.posit.co/cran/__linux__/jammy/latest"`,
+					`2023/09/12 17:02:45.042624054 - CRAN.1 = "https://cran.rstudio.com"`,
+					"2023/09/12 17:02:45.061047966 # Installing required R packages with `packrat::restore()` ---------------------",
+					"2023/09/12 17:02:45.096309315 Warning in packrat::restore(overwrite.dirty = TRUE, prompt = FALSE, restart = FALSE) :",
+					"2023/09/12 17:02:45.096320185   The most recent snapshot was generated using R version 4.3.0",
+					"2023/09/12 17:02:45.141302848 Installing R6 (2.5.1) ...",
+					"2023/09/12 17:02:45.177720769 Using cached R6.",
+					"2023/09/12 17:02:45.179592403 	OK (symlinked cache)",
+					"2023/09/12 17:02:45.179785920 Installing Rcpp (1.0.10) ...",
+					"2023/09/12 17:02:45.224715974 Using cached Rcpp.",
+					"2023/09/12 17:02:45.227149420 	OK (symlinked cache)",
+					"Completed packrat build against R version: '4.3.1'",
+				},
+				Last: 119,
+			},
+			nextOp: events.PublishRestoreREnvOp,
+		},
 	}
 	op := events.AgentOp
+	var err error
+
 	for _, test := range tests {
-		op, err = client.handleTaskUpdate(&test.task, op, log)
+		op, err = handleTaskUpdate(&test.task, op, log)
 		if test.err != nil {
 			s.ErrorIs(err, test.err)
 		} else {
@@ -214,3 +282,38 @@ func (s *ConnectClientSuite) TestWaitForTask() {
 	}
 	log.AssertExpectations(s.T())
 }
+
+func (s *ConnectClientSuite) TestWaitForTaskErr() {
+	log := loggingtest.NewMockLogger()
+
+	str := mock.AnythingOfType("string")
+	anything := mock.Anything
+	log.On("Success", "Done")
+	log.On("Info", str)
+	log.On("Info", str, str, anything)
+	log.On("WithArgs", str, anything).Return(log)
+
+	task := taskDTO{
+		Id: types.TaskID("W3YpnrwUOQJxL5DS"),
+		Output: []string{
+			"Building Jupyter notebook...",
+			"Bundle created with Python version 3.11.3 is compatible with environment Local with Python version 3.11.3 from /opt/python/3.11.3/bin/python3.11",
+			"Bundle requested Python version 3.11.3; using /opt/python/3.11.3/bin/python3.11 which has version 3.11.3",
+			"2023/09/12 13:34:48.308740036 Execution halted",
+			"Build error: exit status 1",
+		},
+		Finished: true,
+		Error:    "exit status 1",
+		Last:     5,
+	}
+
+	op := events.AgentOp
+	op, err := handleTaskUpdate(&task, op, log)
+	s.Equal(&types.AgentError{
+		Code: events.DeploymentFailedCode,
+		Err:  errors.New("exit status 1"),
+		Data: types.ErrorData{},
+	}, err)
+	s.Equal(events.PublishRestorePythonEnvOp, op)
+	log.AssertExpectations(s.T())
+}

From c7bc4c605ce87c7cb00fbdbb337da0426b18de90 Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Tue, 12 Sep 2023 16:08:36 -0400
Subject: [PATCH 10/33] add start event

---
 internal/api_client/clients/client_connect.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/internal/api_client/clients/client_connect.go b/internal/api_client/clients/client_connect.go
index 29d3b4156..bdd1ebdf6 100644
--- a/internal/api_client/clients/client_connect.go
+++ b/internal/api_client/clients/client_connect.go
@@ -325,6 +325,7 @@ func handleTaskUpdate(task *taskDTO, op types.Operation, log logging.Logger) (ty
 			}
 			op = nextOp
 			log = log.WithArgs(logging.LogKeyOp, op)
+			log.Start("Starting")
 		}
 		log.Info(line)
 

From a9490861f6cb9767fef302a4e6095cafd1dd6273 Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Tue, 12 Sep 2023 16:49:42 -0400
Subject: [PATCH 11/33] update test for new log message

---
 internal/api_client/clients/client_connect_test.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/internal/api_client/clients/client_connect_test.go b/internal/api_client/clients/client_connect_test.go
index ebf143548..fe6188d04 100644
--- a/internal/api_client/clients/client_connect_test.go
+++ b/internal/api_client/clients/client_connect_test.go
@@ -61,6 +61,7 @@ func (s *ConnectClientSuite) TestWaitForTask() {
 
 	str := mock.AnythingOfType("string")
 	anything := mock.Anything
+	log.On("Start", "Starting")
 	log.On("Success", "Done")
 	log.On("Info", str)
 	log.On("Info", str, str, anything)
@@ -288,6 +289,7 @@ func (s *ConnectClientSuite) TestWaitForTaskErr() {
 
 	str := mock.AnythingOfType("string")
 	anything := mock.Anything
+	log.On("Start", "Starting")
 	log.On("Success", "Done")
 	log.On("Info", str)
 	log.On("Info", str, str, anything)

From 5e8591bc1b4baba0261d6ad515ea73335052b765 Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Thu, 14 Sep 2023 11:40:08 -0400
Subject: [PATCH 12/33] add overall start/success event

---
 .vscode/launch.json                           |  4 +--
 internal/api_client/clients/client_connect.go | 25 +++++++++++--------
 internal/events/events.go                     |  1 +
 internal/publish/publish.go                   | 10 +++++---
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index d1af61246..3d162f605 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -13,7 +13,7 @@
             "args": [
                 "publish-ui",
                 "-n",
-                "devpwpg",
+                "dogfood",
                 "${workspaceFolder}/notebook1"
             ],
         },
@@ -26,7 +26,7 @@
             "args": [
                 "publish",
                 "-n",
-                "badauth2",
+                "dogfood",
                 "${workspaceFolder}/notebook1",
                 "--debug",
             ],
diff --git a/internal/api_client/clients/client_connect.go b/internal/api_client/clients/client_connect.go
index bdd1ebdf6..54a70666d 100644
--- a/internal/api_client/clients/client_connect.go
+++ b/internal/api_client/clients/client_connect.go
@@ -321,13 +321,17 @@ func handleTaskUpdate(task *taskDTO, op types.Operation, log logging.Logger) (ty
 		nextOp = eventOpFromLogLine(op, line)
 		if nextOp != op {
 			if op != "" {
-				log.Success("Done")
+				log.Success("Done", logging.LogKeyOp, op)
+			}
+
+			if nextOp == "" {
+				fmt.Println("nextOp is empty")
 			}
 			op = nextOp
-			log = log.WithArgs(logging.LogKeyOp, op)
-			log.Start("Starting")
+			log.Start(line, logging.LogKeyOp, op)
+		} else {
+			log.Info(line, logging.LogKeyOp, op)
 		}
-		log.Info(line)
 
 		// Log a progress event for certain matching log lines.
 		event := packageEventFromLogLine(line)
@@ -336,7 +340,8 @@ func handleTaskUpdate(task *taskDTO, op types.Operation, log logging.Logger) (ty
 				"runtime", event.runtime,
 				"status", event.status,
 				"name", event.name,
-				"version", event.version)
+				"version", event.version,
+				logging.LogKeyOp, op)
 		}
 	}
 	if task.Finished {
@@ -344,16 +349,16 @@ func handleTaskUpdate(task *taskDTO, op types.Operation, log logging.Logger) (ty
 			// TODO: make these errors more specific, maybe by
 			// using the Connect error codes from the logs.
 			err := errors.New(task.Error)
-			return nextOp, types.NewAgentError(events.DeploymentFailedCode, err, nil)
+			return op, types.NewAgentError(events.DeploymentFailedCode, err, nil)
 		}
-		log.Success("Done")
+		log.Success("Done", logging.LogKeyOp, op)
 	}
-	return nextOp, nil
+	return op, nil
 }
 
 func (c *ConnectClient) WaitForTask(taskID types.TaskID, log logging.Logger) error {
 	var previous *taskDTO
-	var op events.Operation
+	var op events.Operation = events.PublishOp
 
 	for {
 		task, err := c.getTask(taskID, previous)
@@ -361,7 +366,7 @@ func (c *ConnectClient) WaitForTask(taskID types.TaskID, log logging.Logger) err
 			return err
 		}
 		op, err = handleTaskUpdate(task, op, log)
-		if task.Finished {
+		if err != nil || task.Finished {
 			return err
 		}
 		previous = task
diff --git a/internal/events/events.go b/internal/events/events.go
index 7ea0540f9..dab1bcecd 100644
--- a/internal/events/events.go
+++ b/internal/events/events.go
@@ -34,6 +34,7 @@ const (
 	PublishRestoreREnvOp      Operation = "publish/restoreREnv"
 	PublishRunContentOp       Operation = "publish/runContent"
 	PublishSetVanityUrlOp     Operation = "publish/setVanityURL"
+	PublishOp                 Operation = "publish"
 )
 
 func EventTypeOf(op Operation, phase Phase, errCode ErrorCode) EventType {
diff --git a/internal/publish/publish.go b/internal/publish/publish.go
index 736c179d3..afa2e1908 100644
--- a/internal/publish/publish.go
+++ b/internal/publish/publish.go
@@ -67,12 +67,13 @@ func logAppInfo(accountURL string, contentID types.ContentID, log logging.Logger
 		DashboardURL: fmt.Sprintf("%s/connect/#/apps/%s", accountURL, contentID),
 		DirectURL:    fmt.Sprintf("%s/content/%s", accountURL, contentID),
 	}
-	log.WithArgs(
+	log.Success("Deployment successful",
+		logging.LogKeyOp, events.PublishOp,
 		"dashboardURL", appInfo.DashboardURL,
 		"directURL", appInfo.DirectURL,
 		"serverURL", accountURL,
 		"contentID", contentID,
-	).Info("Deployment successful")
+	)
 	jsonInfo, err := json.Marshal(appInfo)
 	if err != nil {
 		return err
@@ -135,7 +136,10 @@ func withLog[T any](op events.Operation, msg string, label string, log logging.L
 }
 
 func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, account *accounts.Account, client clients.APIClient, log logging.Logger) error {
-	log.Info("Starting deployment to server", "server", account.URL)
+	log.Start("Starting deployment to server",
+		logging.LogKeyOp, events.PublishOp,
+		"server", account.URL,
+	)
 	bundleFile, err := os.CreateTemp("", "bundle-*.tar.gz")
 	if err != nil {
 		return types.ErrToAgentError(events.PublishCreateBundleOp, err)

From ebdb4e037b7ae30c874ced6a5922d32b7b2f023d Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Thu, 14 Sep 2023 14:51:04 -0400
Subject: [PATCH 13/33] fix state and error handling

---
 internal/api_client/clients/client_connect.go | 11 +++-----
 .../api_client/clients/client_connect_test.go | 26 ++++++++++++-------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/internal/api_client/clients/client_connect.go b/internal/api_client/clients/client_connect.go
index 54a70666d..031a8b621 100644
--- a/internal/api_client/clients/client_connect.go
+++ b/internal/api_client/clients/client_connect.go
@@ -323,10 +323,6 @@ func handleTaskUpdate(task *taskDTO, op types.Operation, log logging.Logger) (ty
 			if op != "" {
 				log.Success("Done", logging.LogKeyOp, op)
 			}
-
-			if nextOp == "" {
-				fmt.Println("nextOp is empty")
-			}
 			op = nextOp
 			log.Start(line, logging.LogKeyOp, op)
 		} else {
@@ -348,8 +344,9 @@ func handleTaskUpdate(task *taskDTO, op types.Operation, log logging.Logger) (ty
 		if task.Error != "" {
 			// TODO: make these errors more specific, maybe by
 			// using the Connect error codes from the logs.
-			err := errors.New(task.Error)
-			return op, types.NewAgentError(events.DeploymentFailedCode, err, nil)
+			err := types.NewAgentError(events.DeploymentFailedCode, errors.New(task.Error), nil)
+			err.SetOperation(op)
+			return op, err
 		}
 		log.Success("Done", logging.LogKeyOp, op)
 	}
@@ -358,7 +355,7 @@ func handleTaskUpdate(task *taskDTO, op types.Operation, log logging.Logger) (ty
 
 func (c *ConnectClient) WaitForTask(taskID types.TaskID, log logging.Logger) error {
 	var previous *taskDTO
-	var op events.Operation = events.PublishOp
+	var op events.Operation
 
 	for {
 		task, err := c.getTask(taskID, previous)
diff --git a/internal/api_client/clients/client_connect_test.go b/internal/api_client/clients/client_connect_test.go
index fe6188d04..9f2d074d6 100644
--- a/internal/api_client/clients/client_connect_test.go
+++ b/internal/api_client/clients/client_connect_test.go
@@ -61,9 +61,12 @@ func (s *ConnectClientSuite) TestWaitForTask() {
 
 	str := mock.AnythingOfType("string")
 	anything := mock.Anything
-	log.On("Start", "Starting")
-	log.On("Success", "Done")
-	log.On("Info", str)
+	log.On("Start", "Building Jupyter notebook...", logging.LogKeyOp, events.PublishRestorePythonEnvOp)
+	log.On("Start", "Launching Jupyter notebook...", logging.LogKeyOp, events.PublishRunContentOp)
+	log.On("Start", "Bundle created with R version 4.3.0, Python version 3.11.3, and Quarto version 0.9.105 is compatible with environment Local with R version 4.3.1 from /opt/R/4.3.1/bin/R, Python version 3.11.3 from /opt/python/3.11.3/bin/python3.11, and Quarto version 1.3.450 from /opt/quarto/1.3.450/bin/quarto", logging.LogKeyOp, events.PublishRestoreREnvOp)
+	log.On("Success", "Done", logging.LogKeyOp, events.PublishRestorePythonEnvOp)
+	log.On("Success", "Done", logging.LogKeyOp, events.PublishRunContentOp)
+	log.On("Success", "Done", logging.LogKeyOp, events.AgentOp)
 	log.On("Info", str, str, anything)
 
 	expectedPackages := []struct {
@@ -81,14 +84,18 @@ func (s *ConnectClientSuite) TestWaitForTask() {
 		{rRuntime, downloadAndInstallPackage, "Rcpp", "1.0.10"},
 	}
 	for _, pkg := range expectedPackages {
+		op := events.PublishRestorePythonEnvOp
+		if pkg.rt == rRuntime {
+			op = events.PublishRestoreREnvOp
+		}
 		log.On("Status",
 			"Package restore",
 			"runtime", pkg.rt,
 			"status", pkg.status,
 			"name", pkg.name,
-			"version", pkg.version)
+			"version", pkg.version,
+			logging.LogKeyOp, op)
 	}
-	log.On("WithArgs", str, anything).Return(log)
 	taskID := types.TaskID("W3YpnrwUOQJxL5DS")
 
 	tests := []taskTest{
@@ -289,11 +296,9 @@ func (s *ConnectClientSuite) TestWaitForTaskErr() {
 
 	str := mock.AnythingOfType("string")
 	anything := mock.Anything
-	log.On("Start", "Starting")
-	log.On("Success", "Done")
-	log.On("Info", str)
+
+	log.On("Start", "Building Jupyter notebook...", logging.LogKeyOp, events.PublishRestorePythonEnvOp)
 	log.On("Info", str, str, anything)
-	log.On("WithArgs", str, anything).Return(log)
 
 	task := taskDTO{
 		Id: types.TaskID("W3YpnrwUOQJxL5DS"),
@@ -309,12 +314,13 @@ func (s *ConnectClientSuite) TestWaitForTaskErr() {
 		Last:     5,
 	}
 
-	op := events.AgentOp
+	op := events.Operation("")
 	op, err := handleTaskUpdate(&task, op, log)
 	s.Equal(&types.AgentError{
 		Code: events.DeploymentFailedCode,
 		Err:  errors.New("exit status 1"),
 		Data: types.ErrorData{},
+		Op:   events.PublishRestorePythonEnvOp,
 	}, err)
 	s.Equal(events.PublishRestorePythonEnvOp, op)
 	log.AssertExpectations(s.T())

From 6f7ebe8f509d029d7adce2f7d87466db5e6415c3 Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Thu, 14 Sep 2023 14:51:13 -0400
Subject: [PATCH 14/33] logger naming

---
 internal/logging/logger.go      | 24 ++++++++++++------------
 internal/logging/logger_test.go | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/internal/logging/logger.go b/internal/logging/logger.go
index 3142612ed..c45286c2b 100644
--- a/internal/logging/logger.go
+++ b/internal/logging/logger.go
@@ -38,37 +38,37 @@ type Logger interface {
 	WithArgs(args ...any) Logger
 }
 
-type loggerImpl struct {
+type logger struct {
 	BaseLogger
 }
 
-func New() loggerImpl {
-	return loggerImpl{
+func New() Logger {
+	return logger{
 		slog.Default(),
 	}
 }
 
-func FromStdLogger(log *slog.Logger) loggerImpl {
-	return loggerImpl{log}
+func FromStdLogger(log *slog.Logger) Logger {
+	return logger{log}
 }
 
-func (l loggerImpl) Start(msg string, args ...any) {
+func (l logger) Start(msg string, args ...any) {
 	l.Info(msg, append([]any{LogKeyPhase, StartPhase}, args...)...)
 }
 
-func (l loggerImpl) Success(msg string, args ...any) {
+func (l logger) Success(msg string, args ...any) {
 	l.Info(msg, append([]any{LogKeyPhase, SuccessPhase}, args...)...)
 }
 
-func (l loggerImpl) Status(msg string, args ...any) {
+func (l logger) Status(msg string, args ...any) {
 	l.Info(msg, append([]any{LogKeyPhase, ProgressPhase}, args...)...)
 }
 
-func (l loggerImpl) Progress(msg string, done float32, total float32, args ...any) {
+func (l logger) Progress(msg string, done float32, total float32, args ...any) {
 	l.Info(msg, append([]any{LogKeyPhase, ProgressPhase, "done", done, "total", total}, args...)...)
 }
 
-func (l loggerImpl) Failure(err error) {
+func (l logger) Failure(err error) {
 	if agentError, ok := err.(types.EventableError); ok {
 		args := []any{
 			LogKeyOp, agentError.GetOperation(),
@@ -88,6 +88,6 @@ func (l loggerImpl) Failure(err error) {
 	}
 }
 
-func (l loggerImpl) WithArgs(args ...any) Logger {
-	return loggerImpl{l.BaseLogger.With(args...)}
+func (l logger) WithArgs(args ...any) Logger {
+	return logger{l.BaseLogger.With(args...)}
 }
diff --git a/internal/logging/logger_test.go b/internal/logging/logger_test.go
index 48a02c6f1..de43c5ce5 100644
--- a/internal/logging/logger_test.go
+++ b/internal/logging/logger_test.go
@@ -22,13 +22,13 @@ func TestLoggingSuite(t *testing.T) {
 }
 
 func (s *LoggingSuite) TestDefaultLogger() {
-	log := New()
+	log := New().(logger)
 	s.NotNil(log.BaseLogger)
 }
 
 func (s *LoggingSuite) TestFromStdLogger() {
 	stdLogger := slog.Default()
-	log := FromStdLogger(stdLogger)
+	log := FromStdLogger(stdLogger).(logger)
 	s.NotNil(log.BaseLogger)
 	s.Equal(stdLogger, log.BaseLogger)
 }
@@ -37,7 +37,7 @@ func (s *LoggingSuite) TestStart() {
 	baseLogger := NewMockBaseLogger()
 	baseLogger.On("Info", "message", LogKeyPhase, StartPhase, "arg", "value")
 
-	log := loggerImpl{baseLogger}
+	log := logger{baseLogger}
 	log.Start("message", "arg", "value")
 	baseLogger.AssertExpectations(s.T())
 }
@@ -46,7 +46,7 @@ func (s *LoggingSuite) TestSuccess() {
 	baseLogger := NewMockBaseLogger()
 	baseLogger.On("Info", "message", LogKeyPhase, SuccessPhase, "arg", "value")
 
-	log := loggerImpl{baseLogger}
+	log := logger{baseLogger}
 	log.Success("message", "arg", "value")
 	baseLogger.AssertExpectations(s.T())
 }
@@ -55,7 +55,7 @@ func (s *LoggingSuite) TestStatus() {
 	baseLogger := NewMockBaseLogger()
 	baseLogger.On("Info", "message", LogKeyPhase, ProgressPhase, "arg", "value")
 
-	log := loggerImpl{baseLogger}
+	log := logger{baseLogger}
 	log.Status("message", "arg", "value")
 	baseLogger.AssertExpectations(s.T())
 }
@@ -69,7 +69,7 @@ func (s *LoggingSuite) TestProgress() {
 		"total", float32(100),
 		"arg", "value")
 
-	log := loggerImpl{baseLogger}
+	log := logger{baseLogger}
 	log.Progress("message", 20, 100, "arg", "value")
 	baseLogger.AssertExpectations(s.T())
 }
@@ -79,7 +79,7 @@ func (s *LoggingSuite) TestFailureGoError() {
 	baseLogger.On("Error", "test error", LogKeyPhase, FailurePhase)
 	baseLogger.On("Debug", mock.AnythingOfType("string"))
 
-	log := loggerImpl{baseLogger}
+	log := logger{baseLogger}
 	err := errors.New("test error")
 	log.Failure(err)
 	baseLogger.AssertExpectations(s.T())
@@ -96,7 +96,7 @@ func (s *LoggingSuite) TestFailureAgentError() {
 		LogKeyErrCode, types.UnknownErrorCode,
 		"Metadata", "some metadata")
 
-	log := loggerImpl{baseLogger}
+	log := logger{baseLogger}
 	baseErr := errors.New("test error")
 	errData := struct {
 		Metadata string
@@ -111,7 +111,7 @@ func (s *LoggingSuite) TestWith() {
 	baseLogger := NewMockBaseLogger()
 	expectedLogger := slog.Default()
 	baseLogger.On("With", "arg", "value", "arg2", "value2").Return(expectedLogger)
-	log := loggerImpl{baseLogger}
+	log := logger{baseLogger}
 	actualLogger := log.WithArgs("arg", "value", "arg2", "value2")
-	s.Equal(loggerImpl{expectedLogger}, actualLogger)
+	s.Equal(logger{expectedLogger}, actualLogger)
 }

From 5dcfb4fe08f90df15f0f7bba7c2df79a99cdae8d Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Thu, 14 Sep 2023 08:20:20 -0400
Subject: [PATCH 15/33] make publish API async

---
 internal/services/api/publish.go | 29 +++++++++++++++++++++++------
 internal/services/local_token.go | 21 ++-------------------
 internal/state/deployment.go     | 11 +++++++++++
 internal/util/random.go          | 25 +++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/internal/services/api/publish.go b/internal/services/api/publish.go
index 126cbce3a..6b3041b59 100644
--- a/internal/services/api/publish.go
+++ b/internal/services/api/publish.go
@@ -3,24 +3,41 @@ package api
 // Copyright (C) 2023 by Posit Software, PBC.
 
 import (
+	"encoding/json"
 	"net/http"
 
 	"github.com/rstudio/connect-client/internal/accounts"
 	"github.com/rstudio/connect-client/internal/cli_types"
 	"github.com/rstudio/connect-client/internal/logging"
 	"github.com/rstudio/connect-client/internal/publish"
+	"github.com/rstudio/connect-client/internal/state"
 )
 
+type PublishReponse struct {
+	LocalID state.LocalDeploymentID `json:"local_id"` // Unique ID of this publishing operation. Only valid for this run of the agent.
+}
+
 func PostPublishHandlerFunc(publishArgs *cli_types.PublishArgs, lister accounts.AccountList, log logging.Logger) http.HandlerFunc {
 	return func(w http.ResponseWriter, req *http.Request) {
-		switch req.Method {
-		case http.MethodPost:
+		localID, err := state.NewLocalID()
+		if err != nil {
+			InternalError(w, req, log, err)
+			return
+		}
+		publishArgs.State.LocalID = localID
+		response := PublishReponse{
+			LocalID: localID,
+		}
+		w.Header().Set("content-type", "application/json")
+		w.WriteHeader(http.StatusAccepted)
+		json.NewEncoder(w).Encode(response)
+
+		go func() {
+			log = log.WithArgs("local_id", localID)
 			err := publish.PublishManifestFiles(publishArgs, lister, log)
 			if err != nil {
-				InternalError(w, req, log, err)
+				log.Error("Deployment failed", "error", err.Error())
 			}
-		default:
-			return
-		}
+		}()
 	}
 }
diff --git a/internal/services/local_token.go b/internal/services/local_token.go
index 3e00f1185..90ae6a0ea 100644
--- a/internal/services/local_token.go
+++ b/internal/services/local_token.go
@@ -3,32 +3,15 @@ package services
 // Copyright (C) 2023 by Posit Software, PBC.
 
 import (
-	"encoding/base64"
-	"strings"
-
 	"github.com/rstudio/connect-client/internal/util"
 )
 
 type LocalToken string
 
 func NewLocalToken() (LocalToken, error) {
-	key, err := util.RandomBytes(32)
-	if err != nil {
-		return LocalToken(""), err
-	}
-	tokenString, err := toBase64(key)
+	str, err := util.RandomString(32)
 	if err != nil {
 		return LocalToken(""), err
 	}
-	return LocalToken(tokenString), nil
-}
-
-func toBase64(data []byte) (string, error) {
-	var writer strings.Builder
-	encoder := base64.NewEncoder(base64.RawURLEncoding, &writer)
-	_, err := encoder.Write(data)
-	if err != nil {
-		return "", err
-	}
-	return writer.String(), nil
+	return LocalToken(str), nil
 }
diff --git a/internal/state/deployment.go b/internal/state/deployment.go
index 3eea9c204..db18d6cf2 100644
--- a/internal/state/deployment.go
+++ b/internal/state/deployment.go
@@ -23,7 +23,18 @@ type TargetID struct {
 	DeployedAt types.NullTime     `json:"deployed_at" kong:"-"`        // Date/time bundle was deployed
 }
 
+type LocalDeploymentID string
+
+func NewLocalID() (LocalDeploymentID, error) {
+	str, err := util.RandomString(16)
+	if err != nil {
+		return LocalDeploymentID(""), err
+	}
+	return LocalDeploymentID(str), nil
+}
+
 type Deployment struct {
+	LocalID            LocalDeploymentID `json:"local_id" kong:"-"`            // Unique ID of this publishing operation. Only valid for this run of the agent.
 	SourceDir          util.Path         `json:"source_path" kong:"-"`         // Absolute path to source directory being published
 	Target             TargetID          `json:"target" kong:"embed"`          // Identity of previous deployment
 	Manifest           bundles.Manifest  `json:"manifest" kong:"embed"`        // manifest.json content for this deployment
diff --git a/internal/util/random.go b/internal/util/random.go
index 1b0021401..70c447b96 100644
--- a/internal/util/random.go
+++ b/internal/util/random.go
@@ -4,6 +4,8 @@ package util
 
 import (
 	"crypto/rand"
+	"encoding/base64"
+	"strings"
 )
 
 func RandomBytes(n int) ([]byte, error) {
@@ -11,3 +13,26 @@ func RandomBytes(n int) ([]byte, error) {
 	_, err := rand.Read(buf)
 	return buf, err
 }
+
+func RandomString(n int) (string, error) {
+	// Base64 encoding of bytes->string expands length by 1/3
+	key, err := RandomBytes((n * 3) / 4)
+	if err != nil {
+		return "", err
+	}
+	tokenString, err := toBase64(key)
+	if err != nil {
+		return "", err
+	}
+	return tokenString, nil
+}
+
+func toBase64(data []byte) (string, error) {
+	var writer strings.Builder
+	encoder := base64.NewEncoder(base64.RawURLEncoding, &writer)
+	_, err := encoder.Write(data)
+	if err != nil {
+		return "", err
+	}
+	return writer.String(), nil
+}

From d1f1bbce9ddf0ab911d03ac772f97fc57cd76950 Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Thu, 14 Sep 2023 10:13:34 -0400
Subject: [PATCH 16/33] LocalToken test

---
 internal/services/local_token_test.go | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 internal/services/local_token_test.go

diff --git a/internal/services/local_token_test.go b/internal/services/local_token_test.go
new file mode 100644
index 000000000..557592570
--- /dev/null
+++ b/internal/services/local_token_test.go
@@ -0,0 +1,26 @@
+package services
+
+// Copyright (C) 2023 by Posit Software, PBC.
+
+import (
+	"testing"
+
+	"github.com/rstudio/connect-client/internal/util/utiltest"
+	"github.com/stretchr/testify/suite"
+)
+
+type LocalTokenSuite struct {
+	utiltest.Suite
+}
+
+func TestLocalTokenSuite(t *testing.T) {
+	suite.Run(t, new(LocalTokenSuite))
+}
+
+func (s *LocalTokenSuite) TestNewLocalToken() {
+	token1, err := NewLocalToken()
+	s.NoError(err)
+	token2, err := NewLocalToken()
+	s.NoError(err)
+	s.NotEqual(token1, token2)
+}

From 8479de1baf912a5e42b0f0eca04d958b77458c56 Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Thu, 14 Sep 2023 10:15:51 -0400
Subject: [PATCH 17/33] RandomString test

---
 internal/util/random_test.go | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/internal/util/random_test.go b/internal/util/random_test.go
index 330fc33d1..6ae6d8737 100644
--- a/internal/util/random_test.go
+++ b/internal/util/random_test.go
@@ -18,7 +18,31 @@ func TestRandomSuite(t *testing.T) {
 }
 
 func (s *RandomSuite) TestRandomBytes() {
-	r, err := RandomBytes(32)
-	s.Nil(err)
-	s.Len(r, 32)
+	r1, err := RandomBytes(32)
+	s.NoError(err)
+	s.Len(r1, 32)
+
+	r2, err := RandomBytes(32)
+	s.NoError(err)
+	s.Len(r2, 32)
+	s.NotEqual(r1, r2)
+
+	r3, err := RandomBytes(12)
+	s.NoError(err)
+	s.Len(r3, 12)
+}
+
+func (s *RandomSuite) TestRandomString() {
+	r1, err := RandomString(32)
+	s.NoError(err)
+	s.Len(r1, 32)
+
+	r2, err := RandomString(32)
+	s.NoError(err)
+	s.Len(r2, 32)
+	s.NotEqual(r1, r2)
+
+	r3, err := RandomString(12)
+	s.NoError(err)
+	s.Len(r3, 12)
 }

From 0cd6b687ec55faf26941d138b2e3ffd80c27c978 Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Thu, 14 Sep 2023 10:46:52 -0400
Subject: [PATCH 18/33] publish API test

---
 internal/services/api/publish.go      |  4 +-
 internal/services/api/publish_test.go | 57 +++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 internal/services/api/publish_test.go

diff --git a/internal/services/api/publish.go b/internal/services/api/publish.go
index 6b3041b59..9a79ac210 100644
--- a/internal/services/api/publish.go
+++ b/internal/services/api/publish.go
@@ -17,6 +17,8 @@ type PublishReponse struct {
 	LocalID state.LocalDeploymentID `json:"local_id"` // Unique ID of this publishing operation. Only valid for this run of the agent.
 }
 
+var publishFn = publish.PublishManifestFiles
+
 func PostPublishHandlerFunc(publishArgs *cli_types.PublishArgs, lister accounts.AccountList, log logging.Logger) http.HandlerFunc {
 	return func(w http.ResponseWriter, req *http.Request) {
 		localID, err := state.NewLocalID()
@@ -34,7 +36,7 @@ func PostPublishHandlerFunc(publishArgs *cli_types.PublishArgs, lister accounts.
 
 		go func() {
 			log = log.WithArgs("local_id", localID)
-			err := publish.PublishManifestFiles(publishArgs, lister, log)
+			err := publishFn(publishArgs, lister, log)
 			if err != nil {
 				log.Error("Deployment failed", "error", err.Error())
 			}
diff --git a/internal/services/api/publish_test.go b/internal/services/api/publish_test.go
new file mode 100644
index 000000000..193cffd05
--- /dev/null
+++ b/internal/services/api/publish_test.go
@@ -0,0 +1,57 @@
+package api
+
+// Copyright (C) 2023 by Posit Software, PBC.
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/rstudio/connect-client/internal/accounts"
+	"github.com/rstudio/connect-client/internal/cli_types"
+	"github.com/rstudio/connect-client/internal/logging"
+	"github.com/rstudio/connect-client/internal/state"
+	"github.com/rstudio/connect-client/internal/util/utiltest"
+	"github.com/stretchr/testify/suite"
+)
+
+type PublishHandlerFuncSuite struct {
+	utiltest.Suite
+}
+
+func TestPublishHandlerFuncSuite(t *testing.T) {
+	suite.Run(t, new(PublishHandlerFuncSuite))
+}
+
+func (s *PublishHandlerFuncSuite) TestPublishHandlerFunc() {
+	publishArgs := &cli_types.PublishArgs{
+		State: state.NewDeployment(),
+	}
+	oldID := publishArgs.State.LocalID
+	log := logging.New()
+
+	rec := httptest.NewRecorder()
+	req, err := http.NewRequest("POST", "/api/publish", nil)
+	s.NoError(err)
+
+	publishFn = func(args *cli_types.PublishArgs, lister accounts.AccountList, log logging.Logger) error {
+		s.NotNil(args)
+		s.NotEqual(state.LocalDeploymentID(""), args.State.LocalID)
+		return nil
+	}
+	handler := PostPublishHandlerFunc(publishArgs, nil, log)
+	handler(rec, req)
+
+	s.Equal(http.StatusAccepted, rec.Result().StatusCode)
+	s.Equal("application/json", rec.Header().Get("content-type"))
+
+	res := &PublishReponse{}
+	dec := json.NewDecoder(rec.Body)
+	dec.DisallowUnknownFields()
+	s.NoError(dec.Decode(res))
+
+	s.NotEqual(state.LocalDeploymentID(""), publishArgs.State.LocalID)
+	s.NotEqual(oldID, publishArgs.State.LocalID)
+	s.Equal(publishArgs.State.LocalID, res.LocalID)
+}

From 2499e5eb165312da7e5c97e9bd5c461be2efd89d Mon Sep 17 00:00:00 2001
From: Bill Sager <whs@sager.org>
Date: Mon, 18 Sep 2023 14:07:18 -0700
Subject: [PATCH 19/33] initial refactoring towards POC 9-15 base

---
 web/public/images/publisher-advanced.svg      | 27 +++++++
 web/public/images/publisher-destination.svg   | 11 +++
 web/public/images/publisher-folder.svg        | 10 +++
 web/public/images/publisher-positlogo.svg     | 13 ++++
 web/public/images/publisher-python.svg        | 15 ++++
 web/public/images/publisher-settings.svg      | 29 ++++++++
 web/src/App.vue                               | 67 ++++++++---------
 web/src/api/types/deployments.ts              |  2 +
 web/src/components/AppMenu.vue                | 73 +++++++++++++++++++
 web/src/components/LayoutPanel.vue            | 47 ------------
 .../AdvancedSettings.vue                      |  4 +-
 .../CommonSettings.vue                        |  4 +-
 .../configurePublish/ConfigurePublish.vue     | 51 +++++++++++++
 .../configurePublish/DeploymentMode.vue       | 46 ++++++++++++
 .../DestinationTarget.vue                     |  4 +-
 .../FilesToPublish.vue                        |  4 +-
 .../configurePublish/LayoutPanel.vue          | 60 +++++++++++++++
 .../PublishingHeader.vue}                     | 28 +++++--
 .../PythonProject.vue                         |  4 +-
 .../publishProcess/PublishContent.vue         | 28 +++++++
 web/src/utils/modelWrapper.ts                 | 23 ++++++
 21 files changed, 449 insertions(+), 101 deletions(-)
 create mode 100644 web/public/images/publisher-advanced.svg
 create mode 100644 web/public/images/publisher-destination.svg
 create mode 100644 web/public/images/publisher-folder.svg
 create mode 100644 web/public/images/publisher-positlogo.svg
 create mode 100644 web/public/images/publisher-python.svg
 create mode 100644 web/public/images/publisher-settings.svg
 create mode 100644 web/src/components/AppMenu.vue
 delete mode 100644 web/src/components/LayoutPanel.vue
 rename web/src/components/{panels => configurePublish}/AdvancedSettings.vue (70%)
 rename web/src/components/{panels => configurePublish}/CommonSettings.vue (67%)
 create mode 100644 web/src/components/configurePublish/ConfigurePublish.vue
 create mode 100644 web/src/components/configurePublish/DeploymentMode.vue
 rename web/src/components/{panels => configurePublish}/DestinationTarget.vue (83%)
 rename web/src/components/{panels => configurePublish}/FilesToPublish.vue (95%)
 create mode 100644 web/src/components/configurePublish/LayoutPanel.vue
 rename web/src/components/{PublishProcess.vue => configurePublish/PublishingHeader.vue} (56%)
 rename web/src/components/{panels => configurePublish}/PythonProject.vue (71%)
 create mode 100644 web/src/components/publishProcess/PublishContent.vue
 create mode 100644 web/src/utils/modelWrapper.ts

diff --git a/web/public/images/publisher-advanced.svg b/web/public/images/publisher-advanced.svg
new file mode 100644
index 000000000..4d2233060
--- /dev/null
+++ b/web/public/images/publisher-advanced.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
+<g>
+	<path fill="#d3d3d3" d="M41.5,38.6c-1.4,0.4-3.1,0.5-5.1,0.2c-2-0.3-4.2-0.9-6.7-1.9c-2.5-1-5.1-2.3-7.9-3.9c-2.8-1.6-5.2-3.2-7.3-4.9
+		c-2.1-1.7-3.7-3.3-5-4.9c-1.3-1.6-2.1-3.1-2.4-4.5c-0.3-1.4-0.2-2.7,0.5-3.8c0.7-1.1,1.7-1.9,3.1-2.3c1.4-0.4,3.1-0.5,5.1-0.2
+		c2,0.3,4.2,0.9,6.7,1.9s5.1,2.2,7.9,3.9c2.8,1.6,5.3,3.3,7.3,4.9c2.1,1.7,3.7,3.3,5,4.9c1.3,1.6,2.1,3.1,2.4,4.5
+		c0.3,1.4,0.2,2.7-0.4,3.8C43.9,37.5,42.9,38.2,41.5,38.6z M7,32.5c0.3-1.4,1.2-2.9,2.4-4.5s2.9-3.2,5-4.9c2.1-1.7,4.5-3.3,7.3-4.9
+		c2.8-1.6,5.4-2.9,7.9-3.9s4.7-1.6,6.7-1.9c2-0.3,3.7-0.2,5.1,0.2c1.4,0.4,2.4,1.2,3.1,2.3c0.6,1.1,0.8,2.4,0.5,3.8
+		c-0.3,1.4-1.1,2.9-2.4,4.5c-1.2,1.6-2.9,3.2-5,4.9c-2.1,1.7-4.5,3.3-7.3,4.9c-2.8,1.6-5.4,2.9-7.9,3.9c-2.5,1-4.7,1.6-6.7,1.9
+		c-2,0.3-3.7,0.2-5.1-0.2c-1.4-0.4-2.4-1.2-3.1-2.3C6.8,35.2,6.7,34,7,32.5z M41.8,31.3c-0.9-1.5-2.5-3.2-4.7-5
+		c-2.2-1.8-5-3.7-8.2-5.6c-3.3-1.9-6.2-3.3-8.9-4.3c-2.7-1-4.9-1.5-6.7-1.5c-1.8,0-3,0.5-3.5,1.5c-0.6,1-0.4,2.2,0.5,3.8
+		c0.9,1.5,2.5,3.2,4.7,5c2.2,1.8,4.9,3.7,8.2,5.5c3.3,1.9,6.3,3.4,9,4.4c2.7,1,4.9,1.5,6.7,1.5c1.8,0,2.9-0.5,3.5-1.5
+		C42.8,34,42.7,32.8,41.8,31.3z M13.3,36.5c1.8,0,4-0.5,6.7-1.5c2.7-1,5.7-2.5,9-4.4c3.3-1.9,6-3.7,8.2-5.5c2.2-1.8,3.7-3.5,4.6-5
+		c0.9-1.5,1.1-2.8,0.5-3.8c-0.6-1-1.8-1.5-3.5-1.5c-1.8,0-4,0.5-6.7,1.5c-2.7,1-5.6,2.4-8.9,4.3c-3.3,1.9-6.1,3.8-8.3,5.6
+		c-2.2,1.8-3.8,3.5-4.7,5C9.3,32.8,9.2,34,9.7,35C10.3,36,11.5,36.5,13.3,36.5z M22.5,45.3c-1.1-1-2-2.5-2.7-4.3
+		c-0.8-1.9-1.3-4.1-1.7-6.8c-0.4-2.6-0.6-5.6-0.6-8.8c0-3.2,0.2-6.2,0.6-8.8c0.4-2.6,1-4.9,1.7-6.7c0.8-1.9,1.7-3.3,2.7-4.3
+		c1.1-1,2.2-1.5,3.5-1.5c1.3,0,2.5,0.5,3.5,1.5c1.1,1,2,2.5,2.7,4.3c0.8,1.9,1.3,4.1,1.7,6.7c0.4,2.6,0.6,5.5,0.6,8.8
+		c0,3.2-0.2,6.2-0.6,8.8c-0.4,2.6-1,4.9-1.7,6.8c-0.8,1.9-1.7,3.3-2.7,4.3c-1.1,1-2.2,1.5-3.5,1.5C24.7,46.9,23.5,46.4,22.5,45.3z
+		 M29,41.9c0.9-1.6,1.5-3.7,2-6.6c0.5-2.8,0.7-6.1,0.7-9.9c0-3.8-0.2-7.1-0.7-9.9c-0.5-2.8-1.2-5-2-6.5c-0.9-1.5-1.9-2.3-3-2.3
+		c-1.2,0-2.2,0.8-3,2.3c-0.9,1.5-1.5,3.7-2,6.5c-0.5,2.8-0.7,6.1-0.7,9.9c0,3.8,0.2,7.1,0.7,9.9c0.5,2.8,1.1,5,2,6.6
+		c0.9,1.6,1.9,2.3,3,2.3C27.2,44.3,28.2,43.5,29,41.9z M23.3,28.1c-0.7-0.7-1.1-1.6-1.1-2.7c0-1,0.4-1.9,1.1-2.7
+		c0.7-0.7,1.6-1.1,2.7-1.1c1,0,1.9,0.4,2.7,1.1c0.7,0.7,1.1,1.6,1.1,2.7c0,1.1-0.4,1.9-1.1,2.7c-0.7,0.7-1.6,1.1-2.7,1.1
+		C25,29.2,24.1,28.9,23.3,28.1z"/>
+</g>
+</svg>
diff --git a/web/public/images/publisher-destination.svg b/web/public/images/publisher-destination.svg
new file mode 100644
index 000000000..44c8ee787
--- /dev/null
+++ b/web/public/images/publisher-destination.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
+<g>
+	<path fill="#d3d3d3" d="M9.5,43.3V12.4c0-1.7,0.8-2.7,2.1-3.3c1.5-0.7,2.8-1,5.6-1c6.8,0,11.4,3.4,17.9,3.4c3,0,4.7-0.7,5.7-0.7
+		c1.2,0,2.2,0.8,2.2,2v18.6c0,1.7-0.8,2.8-2.1,3.4c-1.5,0.7-2.7,1-5.6,1c-6.6,0-11.1-3.4-17.9-3.4c-2.4,0-4,0.6-4.5,0.8v10.2
+		c0,0.9-0.8,1.7-1.7,1.7S9.5,44.2,9.5,43.3z M39.5,30.9V14.4c-1.2,0.3-2.7,0.5-4.5,0.5c-6.7,0-11.4-3.4-17.7-3.4
+		c-2.6,0-4,0.7-4.3,1.3v16.6c1-0.4,2.6-0.6,4.5-0.6c7.1,0,11.7,3.4,17.7,3.4C37.8,32.2,39.2,31.5,39.5,30.9z"/>
+</g>
+</svg>
diff --git a/web/public/images/publisher-folder.svg b/web/public/images/publisher-folder.svg
new file mode 100644
index 000000000..0214b862c
--- /dev/null
+++ b/web/public/images/publisher-folder.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
+
+<path fill="#d3d3d3" fill-rule="evenodd" clip-rule="evenodd" d="M48.3,15.7c0-4-2.2-5.4-5.4-5.4c-3.3,0-17.4,0-19.7,0S20,6.3,15.6,6.3
+	c-4.4,0-5.3,0-7.6,0c-5.2,0-4.7,6.5-4.7,6.5c0,3.3,0,21.1,0,23.9C3.3,40,5,43,9.7,43c5.6,0,28.7,0.1,32.9,0.1c3.7,0,5.7-1.3,5.7-5.4
+	C48.3,31.2,48.3,19.6,48.3,15.7z M40.6,40c-3.7,0-23.9-0.1-28.8-0.1c-4.4,0-5.2-1.4-5.2-4.8c0-2.8-0.1-20.5,0-22.6s0.5-2.8,2.9-2.8
+	c2,0,4.4,0,5.4,0c3.5,0,3.8,3.8,6.9,3.8c0.7,0,16,0,18.9,0s4.2,0.3,4.2,4.1c0,3.3,0,13,0,18.5C44.9,39.8,43.8,40,40.6,40z"/>
+</svg>
diff --git a/web/public/images/publisher-positlogo.svg b/web/public/images/publisher-positlogo.svg
new file mode 100644
index 000000000..19c18d07c
--- /dev/null
+++ b/web/public/images/publisher-positlogo.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
+<g>
+	<path fill="#d3d3d3" d="M5.4,9.8l35.3,15.6v0.9L5.4,42.1v-6.3l17.9-7.7l5.3-2.3l-5.3-2.3L5.4,15.8L5.4,9.8 M2.9,5.9l0,11.5l19.4,8.4L2.9,34.2V46
+		l40.3-18.1v-4.2L2.9,5.9L2.9,5.9z"/>
+</g>
+<g>
+	<path fill="#d3d3d3" d="M46.6,9.8l0,6l-17.9,7.7l-5.3,2.3l5.3,2.3l17.9,7.7v6.3L11.3,26.3v-0.9L46.6,9.8 M49.1,5.9L8.8,23.7v4.2L49.1,46V34.2
+		l-19.4-8.4l19.4-8.4L49.1,5.9L49.1,5.9z"/>
+</g>
+</svg>
diff --git a/web/public/images/publisher-python.svg b/web/public/images/publisher-python.svg
new file mode 100644
index 000000000..e9a393c9c
--- /dev/null
+++ b/web/public/images/publisher-python.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
+
+<path id="path1948" fill="#d3d3d3" stroke="#000000" stroke-width="2.5" stroke-linejoin="round" stroke-miterlimit="10" d="M26.3,6
+	c-1.7,0-3.3,0.2-4.7,0.4c-4.2,0.7-4.9,2.3-4.9,5.1v3.7h9.8v1.2h-9.8H13c-2.9,0-5.3,1.7-6.1,5c-0.9,3.7-0.9,6.1,0,10
+	c0.7,2.9,2.4,5,5.2,5h3.4v-4.5c0-3.2,2.8-6.1,6.1-6.1h9.8c2.7,0,4.9-2.2,4.9-5v-9.3c0-2.7-2.2-4.7-4.9-5.1C29.7,6.1,28,6,26.3,6z
+	 M21,9.9c0.6,0,1,0.4,1,1c0,0.6-0.4,1-1,1c-0.6,0-1-0.4-1-1C20,10.3,20.4,9.9,21,9.9z"/>
+
+<path id="path1950" fill="#d3d3d3" stroke="#000000" stroke-width="2.5" stroke-linejoin="round" stroke-miterlimit="10" d="M37.5,16.5
+	v4.4c0,3.4-2.9,6.2-6.1,6.2h-9.8c-2.7,0-4.9,2.3-4.9,5v9.3c0,2.7,2.3,4.2,4.9,5c3.1,0.9,6.1,1.1,9.8,0c2.5-0.7,4.9-2.2,4.9-5v-3.7
+	h-9.8v-1.2h9.8h4.9c2.9,0,3.9-2,4.9-5c1-3.1,1-6,0-10c-0.7-2.8-2.1-5-4.9-5L37.5,16.5z M31.2,41c0.6,0,1,0.4,1,1c0,0.6-0.4,1-1,1
+	c-0.6,0-1-0.4-1-1C30.2,41.4,30.6,41,31.2,41z"/>
+</svg>
diff --git a/web/public/images/publisher-settings.svg b/web/public/images/publisher-settings.svg
new file mode 100644
index 000000000..7fc0b8fde
--- /dev/null
+++ b/web/public/images/publisher-settings.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
+<g>
+	<path fill="#d3d3d3" d="M22.1,45.9c-0.5-0.4-0.9-1-1-1.7l-0.8-3.6l-0.6-0.2l-3.1,1.9c-0.6,0.4-1.3,0.5-2,0.5c-0.7-0.1-1.3-0.4-1.8-0.9L10,39.2
+		c-0.5-0.5-0.8-1.1-0.9-1.8c-0.1-0.7,0.1-1.3,0.5-1.9l1.9-3.1l-0.2-0.6L7.7,31C7,30.8,6.4,30.4,6,29.9c-0.4-0.5-0.6-1.2-0.6-1.9
+		v-3.8c0-0.7,0.2-1.4,0.6-1.9c0.4-0.5,1-0.9,1.7-1.1l3.5-0.9l0.2-0.6l-1.9-3.1C9.1,16,9,15.4,9.1,14.7c0.1-0.7,0.4-1.3,0.9-1.8
+		l2.7-2.7c0.5-0.5,1.1-0.8,1.8-0.9s1.3,0.1,1.9,0.4l3.1,1.9l0.7-0.2L21,7.9c0.2-0.7,0.5-1.3,1-1.7c0.5-0.4,1.2-0.6,1.9-0.6h3.9
+		c0.7,0,1.4,0.2,1.9,0.6c0.5,0.4,0.9,1,1,1.7l0.8,3.6l0.7,0.2l3.1-1.9c0.6-0.4,1.3-0.5,1.9-0.4s1.3,0.4,1.8,0.9l2.7,2.7
+		c0.5,0.5,0.8,1.1,0.9,1.8c0.1,0.7-0.1,1.3-0.5,1.9l-2,3.1l0.2,0.6l3.5,0.9c0.7,0.2,1.3,0.5,1.7,1.1c0.4,0.5,0.6,1.2,0.6,1.9V28
+		c0,0.7-0.2,1.4-0.6,1.9c-0.4,0.5-1,0.9-1.7,1.1l-3.6,0.8l-0.2,0.6l2,3.1c0.4,0.6,0.6,1.3,0.5,1.9c-0.1,0.7-0.4,1.3-0.9,1.8
+		l-2.7,2.7c-0.5,0.5-1.1,0.8-1.8,0.9c-0.7,0.1-1.3-0.1-1.9-0.5l-3.1-1.9l-0.6,0.2l-0.8,3.6c-0.2,0.7-0.5,1.3-1,1.7
+		c-0.5,0.4-1.2,0.6-1.9,0.6H24C23.2,46.6,22.6,46.4,22.1,45.9z M27.5,43.6c0.3,0,0.5-0.1,0.5-0.4l1.2-4.8c0.6-0.1,1.1-0.3,1.7-0.5
+		c0.5-0.2,1-0.5,1.4-0.7l4.2,2.6c0.2,0.2,0.5,0.1,0.7-0.1l2.2-2.3c0.2-0.2,0.2-0.4,0.1-0.7L37,32.5c0.2-0.4,0.5-0.9,0.7-1.4
+		c0.2-0.5,0.4-1.1,0.6-1.7l4.8-1.1c0.3-0.1,0.4-0.2,0.4-0.6v-3.2c0-0.3-0.1-0.5-0.4-0.6l-4.8-1.2c-0.2-0.6-0.4-1.2-0.6-1.7
+		c-0.2-0.5-0.5-1-0.6-1.3l2.6-4.1c0.2-0.3,0.2-0.5-0.1-0.7l-2.3-2.2c-0.2-0.2-0.5-0.2-0.7-0.1L32.3,15c-0.4-0.2-0.9-0.5-1.4-0.7
+		c-0.5-0.2-1.1-0.4-1.7-0.6L28.1,9c0-0.3-0.2-0.4-0.5-0.4h-3.3c-0.3,0-0.5,0.1-0.6,0.4l-1.1,4.8c-0.6,0.2-1.1,0.3-1.7,0.6
+		c-0.6,0.2-1,0.5-1.4,0.7l-4.1-2.5c-0.3-0.1-0.5-0.1-0.7,0.1l-2.3,2.2c-0.2,0.2-0.2,0.5-0.1,0.7l2.6,4.1c-0.2,0.4-0.4,0.8-0.6,1.3
+		c-0.2,0.5-0.5,1.1-0.6,1.7l-4.7,1.2c-0.3,0.1-0.4,0.2-0.4,0.6v3.2c0,0.3,0.1,0.5,0.4,0.6l4.8,1.1c0.2,0.6,0.3,1.1,0.6,1.7
+		c0.2,0.5,0.5,1,0.7,1.4l-2.6,4.1c-0.2,0.3-0.1,0.5,0.1,0.7l2.3,2.3c0.2,0.2,0.5,0.3,0.7,0.1l4.2-2.6c0.4,0.3,0.9,0.5,1.4,0.7
+		c0.5,0.2,1.1,0.4,1.7,0.5l1.2,4.8c0.1,0.3,0.2,0.4,0.6,0.4H27.5z M22.2,32.4c-1.1-0.7-2-1.6-2.7-2.7s-1-2.3-1-3.7
+		c0-1.3,0.3-2.5,1-3.7s1.6-2,2.7-2.6c1.1-0.7,2.3-1,3.7-1c1.3,0,2.6,0.3,3.7,1c1.1,0.7,2,1.5,2.6,2.6c0.7,1.1,1,2.3,1,3.7
+		c0,1.3-0.3,2.6-1,3.7c-0.7,1.1-1.5,2-2.6,2.7c-1.1,0.7-2.3,1-3.7,1C24.6,33.4,23.3,33,22.2,32.4z M28.1,29.8
+		c0.7-0.4,1.2-0.9,1.6-1.6c0.4-0.7,0.6-1.4,0.6-2.2c0-0.8-0.2-1.5-0.6-2.2c-0.4-0.7-0.9-1.2-1.6-1.6c-0.7-0.4-1.4-0.6-2.1-0.6
+		c-0.8,0-1.5,0.2-2.2,0.6s-1.2,0.9-1.6,1.6c-0.4,0.7-0.6,1.4-0.6,2.2c0,0.8,0.2,1.5,0.6,2.2c0.4,0.7,0.9,1.2,1.6,1.6
+		s1.4,0.6,2.2,0.6C26.7,30.4,27.4,30.2,28.1,29.8z"/>
+</g>
+</svg>
diff --git a/web/src/App.vue b/web/src/App.vue
index cd4754320..ffbb1a40b 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -9,61 +9,56 @@
       elevated
       class="bg-primary text-white"
     >
-      <q-toolbar class="max-width-md q-mx-auto">
-        <WhitePositLogo
+      <q-toolbar class="max-width-md q-pa-none">
+        <!-- <WhitePositLogo
           class="posit-logo"
           alt="Posit PBC Logo"
-        />
-        <q-toolbar-title>
-          Publisher
+        /> -->
+        <AppMenu />
+        <q-toolbar-title class="q-pl-xs">
+          Posit Publisher
         </q-toolbar-title>
       </q-toolbar>
     </q-header>
 
     <q-page-container>
-      <q-page
-        class="max-width-md q-mx-auto"
-        padding
-      >
-        <h6 class="q-mt-none q-mb-md">
-          What would you like to be published and how?
-        </h6>
-        <q-list
-          dark
-          bordered
-          class="rounded-borders"
-        >
-          <DestinationTarget />
-          <q-separator />
-          <FilesToPublish />
-          <q-separator />
-          <PythonProject />
-          <q-separator />
-          <CommonSettings />
-          <q-separator />
-          <AdvancedSettings />
-        </q-list>
-        <PublishProcess />
-      </q-page>
+      <ConfigurePublish
+        v-if="currentView === 'configure'"
+        @publish="onPublish"
+      />
+      <PublishContent
+        v-if="currentView === 'publish'"
+        @back="onConfigure"
+      />
     </q-page-container>
   </q-layout>
 </template>
 
 <script setup lang="ts">
-import DestinationTarget from 'src/components/panels/DestinationTarget.vue';
-import FilesToPublish from 'src/components/panels/FilesToPublish.vue';
-import PythonProject from 'src/components/panels/PythonProject.vue';
-import CommonSettings from 'src/components/panels/CommonSettings.vue';
-import AdvancedSettings from 'src/components/panels/AdvancedSettings.vue';
-import PublishProcess from 'src/components/PublishProcess.vue';
-import WhitePositLogo from 'src/components/icons/WhitePositLogo.vue';
+
+import { ref } from 'vue';
+
+import AppMenu from 'src/components/AppMenu.vue';
+import ConfigurePublish from 'src/components/configurePublish/ConfigurePublish.vue';
+import PublishContent from 'src/components/publishProcess/PublishContent.vue';
+// import WhitePositLogo from 'src/components/icons/WhitePositLogo.vue';
 
 import { useApi } from 'src/api';
 import { useDeploymentStore } from 'src/stores/deployment';
 
+type viewType = 'configure' | 'publish';
+
+const currentView = ref(<viewType>'configure');
 const api = useApi();
 const deploymentStore = useDeploymentStore();
 
+const onPublish = () => {
+  currentView.value = 'publish';
+};
+const onConfigure = () => {
+  currentView.value = 'configure';
+};
+
 const getInitialDeploymentState = async() => {
   const { data: deployment } = await api.deployment.get();
   deploymentStore.deployment = deployment;
diff --git a/web/src/api/types/deployments.ts b/web/src/api/types/deployments.ts
index 506690eaf..b8bbc92f9 100644
--- a/web/src/api/types/deployments.ts
+++ b/web/src/api/types/deployments.ts
@@ -22,3 +22,5 @@ export type Deployment = {
     connect: ConnectDeployment;
     pythonRequirements: string[];
 }
+
+export type DeploymentModeType = 'new' | 'update';
diff --git a/web/src/components/AppMenu.vue b/web/src/components/AppMenu.vue
new file mode 100644
index 000000000..0f50c30c9
--- /dev/null
+++ b/web/src/components/AppMenu.vue
@@ -0,0 +1,73 @@
+<!-- Copyright (C) 2023 by Posit Software, PBC. -->
+
+<template>
+  <div class="text-white row">
+    <q-btn
+      flat
+      icon="menu"
+
+      class="q-px-xs"
+      @click="menu = !menu"
+    >
+      <q-menu
+        dark
+      >
+        <!-- <q-list
+          style="min-width: 100px"
+          class="q-pa-sm"
+        >
+          <q-item
+            v-close-popup
+            clickable
+            class="q-my-sm"
+          >
+            <q-item-section>Overview</q-item-section>
+          </q-item>
+
+          <q-item
+            v-close-popup
+            clickable
+            class="q-my-sm"
+          >
+            <q-item-section>Posit Publishing FAQs</q-item-section>
+          </q-item>
+
+          <q-separator dark />
+
+          <q-item
+            v-close-popup
+            clickable
+            class="q-my-sm"
+          >
+            <q-item-section>Show Agent Console</q-item-section>
+          </q-item>
+
+          <q-item
+            v-close-popup
+            clickable
+            class="q-my-sm"
+          >
+            <q-item-section>Create Diagnostic Bundle</q-item-section>
+          </q-item>
+
+          <q-separator dark />
+
+          <q-item
+            v-close-popup
+            clickable
+            class="q-my-sm"
+          >
+            <q-item-section>About</q-item-section>
+          </q-item>
+        </q-list> -->
+      </q-menu>
+    </q-btn>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+
+const menu = ref(false);
+
+</script>
diff --git a/web/src/components/LayoutPanel.vue b/web/src/components/LayoutPanel.vue
deleted file mode 100644
index b91c24025..000000000
--- a/web/src/components/LayoutPanel.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- Copyright (C) 2023 by Posit Software, PBC. -->
-
-<template>
-  <q-expansion-item>
-    <template #header>
-      <q-item-section avatar>
-        <q-icon
-          :name="icon"
-          size="35px"
-        />
-      </q-item-section>
-
-      <q-item-section>
-        <q-item-label>{{ title }}</q-item-label>
-        <q-item-label
-          v-if="subtitle"
-          caption
-        >
-          {{ subtitle }}
-        </q-item-label>
-        <q-tooltip
-          v-if="tooltip"
-          anchor="top middle"
-        >
-          {{ tooltip }}
-        </q-tooltip>
-      </q-item-section>
-    </template>
-
-    <q-card class="bg-grey-9">
-      <q-card-section>
-        <slot />
-        <!-- TODO: select from previous deployments or add to existing or new targets -->
-      </q-card-section>
-    </q-card>
-  </q-expansion-item>
-</template>
-
-<script setup lang="ts">
-defineProps<{
-    title: string
-    subtitle?: string
-    icon: string
-    tooltip?: string
-  }>();
-</script>
-
diff --git a/web/src/components/panels/AdvancedSettings.vue b/web/src/components/configurePublish/AdvancedSettings.vue
similarity index 70%
rename from web/src/components/panels/AdvancedSettings.vue
rename to web/src/components/configurePublish/AdvancedSettings.vue
index 02adf2774..cca067db7 100644
--- a/web/src/components/panels/AdvancedSettings.vue
+++ b/web/src/components/configurePublish/AdvancedSettings.vue
@@ -3,7 +3,7 @@
 <template>
   <LayoutPanel
     title="Advanced Settings"
-    icon="img:images/settings.png"
+    icon="img:images/publisher-advanced.svg"
   >
     TODO: Show list of editable settings (and some as read-only)
     based on capabilities of target server.
@@ -11,5 +11,5 @@
 </template>
 
 <script setup lang="ts">
-import LayoutPanel from 'src/components/LayoutPanel.vue';
+import LayoutPanel from 'src/components/configurePublish/LayoutPanel.vue';
 </script>
diff --git a/web/src/components/panels/CommonSettings.vue b/web/src/components/configurePublish/CommonSettings.vue
similarity index 67%
rename from web/src/components/panels/CommonSettings.vue
rename to web/src/components/configurePublish/CommonSettings.vue
index ea99cdb2e..f7210dcc5 100644
--- a/web/src/components/panels/CommonSettings.vue
+++ b/web/src/components/configurePublish/CommonSettings.vue
@@ -3,13 +3,13 @@
 <template>
   <LayoutPanel
     title="Common Settings"
-    icon="img:images/info.png"
+    icon="img:images/publisher-settings.svg"
   >
     TODO: Common settings, probably off the info panel in dashboard
   </LayoutPanel>
 </template>
 
 <script setup lang="ts">
-import LayoutPanel from 'src/components/LayoutPanel.vue';
+import LayoutPanel from 'src/components/configurePublish/LayoutPanel.vue';
 </script>
 
diff --git a/web/src/components/configurePublish/ConfigurePublish.vue b/web/src/components/configurePublish/ConfigurePublish.vue
new file mode 100644
index 000000000..eb1fd1a39
--- /dev/null
+++ b/web/src/components/configurePublish/ConfigurePublish.vue
@@ -0,0 +1,51 @@
+<template>
+  <q-page
+    class="max-width-md q-mx-auto"
+    padding
+  >
+    <DeploymentMode
+      v-model="deploymentMode"
+    />
+    <PublishingHeader
+      @publish="emit('publish')"
+    />
+    <q-list
+      dark
+      bordered
+      class="rounded-borders"
+    >
+      <DestinationTarget />
+      <q-separator />
+      <FilesToPublish />
+      <q-separator />
+      <PythonProject />
+      <q-separator />
+      <CommonSettings />
+      <q-separator />
+      <AdvancedSettings />
+    </q-list>
+  </q-page>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue';
+
+import DeploymentMode from 'src/components/configurePublish/DeploymentMode.vue';
+import PublishingHeader from 'src/components/configurePublish/PublishingHeader.vue';
+import DestinationTarget from 'src/components/configurePublish/DestinationTarget.vue';
+import FilesToPublish from 'src/components/configurePublish/FilesToPublish.vue';
+import PythonProject from 'src/components/configurePublish/PythonProject.vue';
+import CommonSettings from 'src/components/configurePublish/CommonSettings.vue';
+import AdvancedSettings from 'src/components/configurePublish/AdvancedSettings.vue';
+
+import type { DeploymentModeType } from 'src/api/types/deployments.ts';
+
+const emit = defineEmits([<string>'publish']);
+
+const deploymentMode = ref<DeploymentModeType>('new');
+
+watch(deploymentMode, (newValue) => {
+  console.log(`new value is ${newValue}`);
+});
+
+</script>
diff --git a/web/src/components/configurePublish/DeploymentMode.vue b/web/src/components/configurePublish/DeploymentMode.vue
new file mode 100644
index 000000000..8774ec643
--- /dev/null
+++ b/web/src/components/configurePublish/DeploymentMode.vue
@@ -0,0 +1,46 @@
+<!-- Copyright (C) 2023 by Posit Software, PBC. -->
+
+<template>
+  <div class="row justify-center">
+    <div style="width: 60%">
+      <q-btn-toggle
+        v-model="deployMode"
+        no-caps
+        unelevated
+        dark
+        size="1rem"
+        padding="2px"
+        spread
+        toggle-color="primary"
+        color="dark-grey"
+        text-color="white"
+        :options="options"
+        style="border: 1px solid #027be3;"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { PropType } from 'vue';
+
+import { useModelWrapper } from 'src/utils/modelWrapper.ts';
+import type { DeploymentModeType } from 'src/api/types/deployments.ts';
+
+const emit = defineEmits([<string>'update:modelValue']);
+
+const props = defineProps({
+  modelValue: {
+    type: String as PropType<DeploymentModeType>,
+    required: true,
+  },
+});
+
+const deployMode = useModelWrapper(props, emit);
+
+const options = [
+  { label: 'New Deployment', value: 'new' },
+  { label: 'Existing Deployment', value: 'update' }
+];
+
+</script>
diff --git a/web/src/components/panels/DestinationTarget.vue b/web/src/components/configurePublish/DestinationTarget.vue
similarity index 83%
rename from web/src/components/panels/DestinationTarget.vue
rename to web/src/components/configurePublish/DestinationTarget.vue
index 322de1ae5..e6385d438 100644
--- a/web/src/components/panels/DestinationTarget.vue
+++ b/web/src/components/configurePublish/DestinationTarget.vue
@@ -4,7 +4,7 @@
   <LayoutPanel
     title="Destination"
     :subtitle="destinationTitle"
-    icon="img:images/posit-logo-only-unofficial.svg"
+    icon="img:images/publisher-destination.svg"
   >
     TODO: select from previous deployments or add to existing or new targets
   </LayoutPanel>
@@ -13,7 +13,7 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 
-import LayoutPanel from 'src/components/LayoutPanel.vue';
+import LayoutPanel from 'src/components/configurePublish/LayoutPanel.vue';
 import { useDeploymentStore } from 'src/stores/deployment';
 
 const deploymentStore = useDeploymentStore();
diff --git a/web/src/components/panels/FilesToPublish.vue b/web/src/components/configurePublish/FilesToPublish.vue
similarity index 95%
rename from web/src/components/panels/FilesToPublish.vue
rename to web/src/components/configurePublish/FilesToPublish.vue
index 0e3e90d7b..10de98e7a 100644
--- a/web/src/components/panels/FilesToPublish.vue
+++ b/web/src/components/configurePublish/FilesToPublish.vue
@@ -4,7 +4,7 @@
   <LayoutPanel
     title="Files"
     :subtitle="fileSummary"
-    icon="img:/images/files-icon.jpg"
+    icon="img:images/publisher-folder.svg"
   >
     <q-tree
       v-model:ticked="deploymentStore.files"
@@ -22,7 +22,7 @@
 import type { QTree, QTreeNode } from 'quasar';
 import { ref, computed } from 'vue';
 
-import LayoutPanel from 'src/components/LayoutPanel.vue';
+import LayoutPanel from 'src/components/configurePublish/LayoutPanel.vue';
 import { useApi, DeploymentFile } from 'src/api';
 import { useDeploymentStore } from 'src/stores/deployment';
 
diff --git a/web/src/components/configurePublish/LayoutPanel.vue b/web/src/components/configurePublish/LayoutPanel.vue
new file mode 100644
index 000000000..67ca039ed
--- /dev/null
+++ b/web/src/components/configurePublish/LayoutPanel.vue
@@ -0,0 +1,60 @@
+<!-- Copyright (C) 2023 by Posit Software, PBC. -->
+
+<template>
+  <q-expansion-item
+    :default-opened="defaultOpen"
+    :expand-icon="expandIcon"
+    header-style="padding: unset;"
+    :group="props.group"
+  >
+    <template #header>
+      <q-item-section
+        avatar
+        class="q-ml-sm"
+      >
+        <q-icon
+          :name="props.icon"
+          :style="props.iconStyle"
+          size="35px"
+        />
+      </q-item-section>
+
+      <q-item-section>
+        <q-item-label>{{ props.title }}</q-item-label>
+        <q-item-label
+          v-if="props.subtitle"
+          caption
+        >
+          {{ props.subtitle }}
+        </q-item-label>
+        <q-tooltip
+          v-if="props.tooltip"
+          anchor="top middle"
+        >
+          {{ props.tooltip }}
+        </q-tooltip>
+      </q-item-section>
+    </template>
+
+    <q-card dark>
+      <q-card-section>
+        <slot />
+        <!-- TODO: select from previous deployments or add to existing or new targets -->
+      </q-card-section>
+    </q-card>
+  </q-expansion-item>
+</template>
+
+<script setup lang="ts">
+
+const props = defineProps({
+  title: { type: String, required: true },
+  subtitle: { type: String, required: false, default: null },
+  icon: { type: String, required: true },
+  iconStyle: { type: String, required: false, default: '' },
+  tooltip: { type: String, required: false, default: null },
+  defaultOpen: { type: Boolean, required: false, default: false },
+  expandIcon: { type: String, required: false, default: null },
+  group: { type: String, required: false, default: null },
+});
+</script>
diff --git a/web/src/components/PublishProcess.vue b/web/src/components/configurePublish/PublishingHeader.vue
similarity index 56%
rename from web/src/components/PublishProcess.vue
rename to web/src/components/configurePublish/PublishingHeader.vue
index 40a231384..c8144fc52 100644
--- a/web/src/components/PublishProcess.vue
+++ b/web/src/components/configurePublish/PublishingHeader.vue
@@ -1,12 +1,25 @@
 <!-- Copyright (C) 2023 by Posit Software, PBC. -->
 
 <template>
-  <div class="q-mt-sm fit row wrap justify-end items-start content-start">
+  <div
+    class="q-my-lg row justify-between"
+    style="align-items: flex-start;"
+  >
+    <q-input
+      v-model="title"
+      label="Title"
+      outlined
+      dense
+      dark
+      clearable
+      hint="Enter a title for your content on the server"
+      style="min-width: 75%"
+    />
     <q-btn
-      :disable="disablePublishingAction"
-      class="q-mt-sm q-ml-sm"
       color="primary"
       label="Publish"
+      padding="8px 30px"
+      class="q-ml-xs"
       @click="onPublish"
     />
   </div>
@@ -17,19 +30,18 @@
 import { ref } from 'vue';
 import { useApi } from 'src/api';
 
-const api = useApi();
+const emit = defineEmits([<string>'publish']);
 
-const disablePublishingAction = ref(false);
+const api = useApi();
+const title = ref('');
 
 const onPublish = async() => {
-  disablePublishingAction.value = true;
+  emit('publish');
   try {
     await api.publish.start();
   } catch (e) {
     // Temporary until we determine the mechanism to notify users of general errors.
     console.log('An error has occurred when calling publish.start:', e);
   }
-  disablePublishingAction.value = false;
 };
-
 </script>
diff --git a/web/src/components/panels/PythonProject.vue b/web/src/components/configurePublish/PythonProject.vue
similarity index 71%
rename from web/src/components/panels/PythonProject.vue
rename to web/src/components/configurePublish/PythonProject.vue
index 0b8de83ce..e33e7254b 100644
--- a/web/src/components/panels/PythonProject.vue
+++ b/web/src/components/configurePublish/PythonProject.vue
@@ -3,7 +3,7 @@
 <template>
   <LayoutPanel
     title="Python"
-    icon="img:images/python-logo-only.svg"
+    icon="img:images/publisher-python.svg"
   >
     TODO: Show detailed python version and list of package dependencies
     with ability to add or remove package dependencies.
@@ -11,6 +11,6 @@
 </template>
 
 <script setup lang="ts">
-import LayoutPanel from 'src/components/LayoutPanel.vue';
+import LayoutPanel from 'src/components/configurePublish/LayoutPanel.vue';
 </script>
 
diff --git a/web/src/components/publishProcess/PublishContent.vue b/web/src/components/publishProcess/PublishContent.vue
new file mode 100644
index 000000000..1dd611c1f
--- /dev/null
+++ b/web/src/components/publishProcess/PublishContent.vue
@@ -0,0 +1,28 @@
+<!-- Copyright (C) 2023 by Posit Software, PBC. -->
+
+<template>
+  <q-page
+    class="max-width-md q-mx-auto"
+    padding
+    dark
+  >
+    <div>
+      <q-btn
+        color="primary"
+        icon="arrow_back"
+        label="Back"
+        @click="onBackButton"
+      />
+    </div>
+  </q-page>
+</template>
+
+<script setup lang="ts">
+
+const emit = defineEmits([<string>'back']);
+
+const onBackButton = () => {
+  emit('back');
+};
+
+</script>
diff --git a/web/src/utils/modelWrapper.ts b/web/src/utils/modelWrapper.ts
new file mode 100644
index 000000000..00af7aea5
--- /dev/null
+++ b/web/src/utils/modelWrapper.ts
@@ -0,0 +1,23 @@
+// Copyright (C) 2023 by Posit Software, PBC.
+
+import { computed } from 'vue';
+
+// Implemented from: V-Model in Vue3
+// https://vanoneang.github.io/article/v-model-in-vue3.html#turn-it-into-a-composable
+//
+// This technique provides us a way of creating a component which supports multiple
+// v-models in its props, but doesn't need to keep implementing the emits, nor the
+// typical watches.
+//
+// See DeploymentMode.vue for example of usage.
+
+export function useModelWrapper(
+  props: { modelValue: unknown; },
+  emit: (arg0: string, arg1: unknown) => void,
+  updateName = 'modelValue',
+) {
+  return computed({
+    get: () => props.modelValue,
+    set: (value) => emit(`update:${updateName}`, value)
+  });
+}

From 710c2ba153a21ebbfba83a180ccdf8bfdd29a789 Mon Sep 17 00:00:00 2001
From: Bill Sager <whs@sager.org>
Date: Mon, 18 Sep 2023 14:23:15 -0700
Subject: [PATCH 20/33] rename component

---
 web/src/App.vue                                               | 4 ++--
 .../publishProcess/{PublishContent.vue => PublishProcess.vue} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename web/src/components/publishProcess/{PublishContent.vue => PublishProcess.vue} (100%)

diff --git a/web/src/App.vue b/web/src/App.vue
index ffbb1a40b..582635f2f 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -26,7 +26,7 @@
         v-if="currentView === 'configure'"
         @publish="onPublish"
       />
-      <PublishContent
+      <PublishProcess
         v-if="currentView === 'publish'"
         @back="onConfigure"
       />
@@ -40,7 +40,7 @@ import { ref } from 'vue';
 
 import AppMenu from 'src/components/AppMenu.vue';
 import ConfigurePublish from 'src/components/configurePublish/ConfigurePublish.vue';
-import PublishContent from 'src/components/publishProcess/PublishContent.vue';
+import PublishProcess from 'src/components/publishProcess/PublishProcess.vue';
 // import WhitePositLogo from 'src/components/icons/WhitePositLogo.vue';
 
 import { useApi } from 'src/api';
diff --git a/web/src/components/publishProcess/PublishContent.vue b/web/src/components/publishProcess/PublishProcess.vue
similarity index 100%
rename from web/src/components/publishProcess/PublishContent.vue
rename to web/src/components/publishProcess/PublishProcess.vue

From 3bf281b16e5ef513de177d0ce58002fad20e857e Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Tue, 19 Sep 2023 08:53:59 -0400
Subject: [PATCH 21/33] use an interface for the publisher

---
 cmd/connect-client/commands/publish.go |  9 ++--
 internal/publish/publish.go            | 75 +++++++++++++++++---------
 internal/publish/publish_test.go       | 13 +++--
 internal/services/api/publish.go       |  9 ++--
 internal/services/api/publish_test.go  | 23 ++++++--
 internal/services/ui/ui_service.go     |  4 +-
 6 files changed, 91 insertions(+), 42 deletions(-)

diff --git a/cmd/connect-client/commands/publish.go b/cmd/connect-client/commands/publish.go
index bc9bfdde2..7a4c935af 100644
--- a/cmd/connect-client/commands/publish.go
+++ b/cmd/connect-client/commands/publish.go
@@ -215,7 +215,8 @@ func (cmd *CreateBundleCmd) Run(args *cli_types.CommonArgs, ctx *cli_types.CLICo
 	if err != nil {
 		return err
 	}
-	return publish.CreateBundleFromDirectory(&cmd.PublishArgs, cmd.BundleFile, ctx.Logger)
+	publisher := publish.New(&cmd.PublishArgs)
+	return publisher.CreateBundleFromDirectory(cmd.BundleFile, ctx.Logger)
 }
 
 type WriteManifestCmd struct {
@@ -227,7 +228,8 @@ func (cmd *WriteManifestCmd) Run(args *cli_types.CommonArgs, ctx *cli_types.CLIC
 	if err != nil {
 		return err
 	}
-	return publish.WriteManifestFromDirectory(&cmd.PublishArgs, ctx.Logger)
+	publisher := publish.New(&cmd.PublishArgs)
+	return publisher.WriteManifestFromDirectory(ctx.Logger)
 }
 
 type PublishCmd struct {
@@ -239,7 +241,8 @@ func (cmd *PublishCmd) Run(args *cli_types.CommonArgs, ctx *cli_types.CLIContext
 	if err != nil {
 		return err
 	}
-	return publish.PublishDirectory(&cmd.PublishArgs, ctx.Accounts, ctx.Logger)
+	publisher := publish.New(&cmd.PublishArgs)
+	return publisher.PublishDirectory(ctx.Accounts, ctx.Logger)
 }
 
 type PublishUICmd struct {
diff --git a/internal/publish/publish.go b/internal/publish/publish.go
index afa2e1908..bf3efdded 100644
--- a/internal/publish/publish.go
+++ b/internal/publish/publish.go
@@ -21,13 +21,23 @@ import (
 	"github.com/rstudio/connect-client/internal/util"
 )
 
-func CreateBundleFromDirectory(cmd *cli_types.PublishArgs, dest util.Path, log logging.Logger) error {
+type Publisher struct {
+	args *cli_types.PublishArgs
+}
+
+func New(args *cli_types.PublishArgs) *Publisher {
+	return &Publisher{
+		args: args,
+	}
+}
+
+func (p *Publisher) CreateBundleFromDirectory(dest util.Path, log logging.Logger) error {
 	bundleFile, err := dest.Create()
 	if err != nil {
 		return err
 	}
 	defer bundleFile.Close()
-	bundler, err := bundles.NewBundler(cmd.State.SourceDir, &cmd.State.Manifest, cmd.Exclude, nil, log)
+	bundler, err := bundles.NewBundler(p.args.State.SourceDir, &p.args.State.Manifest, p.args.Exclude, nil, log)
 	if err != nil {
 		return err
 	}
@@ -35,8 +45,8 @@ func CreateBundleFromDirectory(cmd *cli_types.PublishArgs, dest util.Path, log l
 	return err
 }
 
-func WriteManifestFromDirectory(cmd *cli_types.PublishArgs, log logging.Logger) error {
-	bundler, err := bundles.NewBundler(cmd.State.SourceDir, &cmd.State.Manifest, cmd.Exclude, nil, log)
+func (p *Publisher) WriteManifestFromDirectory(log logging.Logger) error {
+	bundler, err := bundles.NewBundler(p.args.State.SourceDir, &p.args.State.Manifest, p.args.Exclude, nil, log)
 	if err != nil {
 		return err
 	}
@@ -44,7 +54,7 @@ func WriteManifestFromDirectory(cmd *cli_types.PublishArgs, log logging.Logger)
 	if err != nil {
 		return err
 	}
-	manifestPath := cmd.State.SourceDir.Join(bundles.ManifestFilename)
+	manifestPath := p.args.State.SourceDir.Join(bundles.ManifestFilename)
 	log.Info("Writing manifest", "path", manifestPath)
 	manifestJSON, err := manifest.ToJSON()
 	if err != nil {
@@ -62,7 +72,7 @@ type appInfo struct {
 	DirectURL    string `json:"direct-url"`
 }
 
-func logAppInfo(accountURL string, contentID types.ContentID, log logging.Logger) error {
+func (p *Publisher) logAppInfo(accountURL string, contentID types.ContentID, log logging.Logger) error {
 	appInfo := appInfo{
 		DashboardURL: fmt.Sprintf("%s/connect/#/apps/%s", accountURL, contentID),
 		DirectURL:    fmt.Sprintf("%s/content/%s", accountURL, contentID),
@@ -82,25 +92,29 @@ func logAppInfo(accountURL string, contentID types.ContentID, log logging.Logger
 	return err
 }
 
-func PublishManifestFiles(cmd *cli_types.PublishArgs, lister accounts.AccountList, log logging.Logger) error {
-	bundler, err := bundles.NewBundlerForManifest(cmd.State.SourceDir, &cmd.State.Manifest, log)
+func (p *Publisher) PublishManifestFiles(lister accounts.AccountList, log logging.Logger) error {
+	bundler, err := bundles.NewBundlerForManifest(p.args.State.SourceDir, &p.args.State.Manifest, log)
 	if err != nil {
 		return err
 	}
-	return publish(cmd, bundler, lister, log)
+	return p.publish(bundler, lister, log)
 }
 
-func PublishDirectory(cmd *cli_types.PublishArgs, lister accounts.AccountList, log logging.Logger) error {
-	log.Info("Publishing from directory", "path", cmd.State.SourceDir)
-	bundler, err := bundles.NewBundler(cmd.State.SourceDir, &cmd.State.Manifest, cmd.Exclude, nil, log)
+func (p *Publisher) PublishDirectory(lister accounts.AccountList, log logging.Logger) error {
+	log.Info("Publishing from directory", "path", p.args.State.SourceDir)
+	bundler, err := bundles.NewBundler(p.args.State.SourceDir, &p.args.State.Manifest, p.args.Exclude, nil, log)
 	if err != nil {
 		return err
 	}
-	return publish(cmd, bundler, lister, log)
+	return p.publish(bundler, lister, log)
 }
 
-func publish(cmd *cli_types.PublishArgs, bundler bundles.Bundler, lister accounts.AccountList, log logging.Logger) error {
-	account, err := lister.GetAccountByName(cmd.State.Target.AccountName)
+func (p *Publisher) publish(
+	bundler bundles.Bundler,
+	lister accounts.AccountList,
+	log logging.Logger) error {
+
+	account, err := lister.GetAccountByName(p.args.State.Target.AccountName)
 	if err != nil {
 		return err
 	}
@@ -110,7 +124,7 @@ func publish(cmd *cli_types.PublishArgs, bundler bundles.Bundler, lister account
 	if err != nil {
 		return err
 	}
-	err = publishWithClient(cmd, bundler, account, client, log)
+	err = p.publishWithClient(bundler, account, client, log)
 	if err != nil {
 		log.Failure(err)
 	}
@@ -121,7 +135,13 @@ type DeploymentNotFoundDetails struct {
 	ContentID types.ContentID
 }
 
-func withLog[T any](op events.Operation, msg string, label string, log logging.Logger, fn func() (T, error)) (value T, err error) {
+func withLog[T any](
+	op events.Operation,
+	msg string,
+	label string,
+	log logging.Logger,
+	fn func() (T, error)) (value T, err error) {
+
 	log = log.WithArgs(logging.LogKeyOp, op)
 	log.Start(msg)
 	value, err = fn()
@@ -135,7 +155,12 @@ func withLog[T any](op events.Operation, msg string, label string, log logging.L
 	return value, nil
 }
 
-func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, account *accounts.Account, client clients.APIClient, log logging.Logger) error {
+func (p *Publisher) publishWithClient(
+	bundler bundles.Bundler,
+	account *accounts.Account,
+	client clients.APIClient,
+	log logging.Logger) error {
+
 	log.Start("Starting deployment to server",
 		logging.LogKeyOp, events.PublishOp,
 		"server", account.URL,
@@ -160,10 +185,10 @@ func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, acco
 	}
 
 	var contentID types.ContentID
-	if cmd.State.Target.ContentId != "" && !cmd.New {
-		contentID = cmd.State.Target.ContentId
+	if p.args.State.Target.ContentId != "" && !p.args.New {
+		contentID = p.args.State.Target.ContentId
 		_, err := withLog(events.PublishCreateDeploymentOp, "Updating deployment", "content_id", log, func() (any, error) {
-			return contentID, client.UpdateDeployment(contentID, cmd.State.Connect.Content)
+			return contentID, client.UpdateDeployment(contentID, p.args.State.Connect.Content)
 		})
 		if err != nil {
 			httpErr, ok := err.(*clients.HTTPError)
@@ -177,7 +202,7 @@ func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, acco
 		}
 	} else {
 		contentID, err = withLog(events.PublishCreateDeploymentOp, "Creating deployment", "content_id", log, func() (types.ContentID, error) {
-			return client.CreateDeployment(cmd.State.Connect.Content)
+			return client.CreateDeployment(p.args.State.Connect.Content)
 		})
 		if err != nil {
 			return err
@@ -192,7 +217,7 @@ func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, acco
 		return err
 	}
 
-	cmd.State.Target = state.TargetID{
+	p.args.State.Target = state.TargetID{
 		ServerType:  account.ServerType,
 		AccountName: account.Name,
 		ServerURL:   account.URL,
@@ -210,11 +235,11 @@ func publishWithClient(cmd *cli_types.PublishArgs, bundler bundles.Bundler, acco
 		return err
 	}
 
-	taskLogger := log.WithArgs("source", "serverLog")
+	taskLogger := log.WithArgs("source", "serverp.log")
 	err = client.WaitForTask(taskID, taskLogger)
 	if err != nil {
 		return err
 	}
 	log = log.WithArgs(logging.LogKeyOp, events.AgentOp)
-	return logAppInfo(account.URL, contentID, log)
+	return p.logAppInfo(account.URL, contentID, log)
 }
diff --git a/internal/publish/publish_test.go b/internal/publish/publish_test.go
index 0bfed1024..8752bcc73 100644
--- a/internal/publish/publish_test.go
+++ b/internal/publish/publish_test.go
@@ -54,7 +54,8 @@ func (s *PublishSuite) TestCreateBundle() {
 		State: state.NewDeployment(),
 	}
 	cmd.State.SourceDir = s.cwd
-	err := CreateBundleFromDirectory(cmd, dest, s.log)
+	publisher := New(cmd)
+	err := publisher.CreateBundleFromDirectory(dest, s.log)
 	s.NoError(err)
 	s.True(dest.Exists())
 }
@@ -70,7 +71,8 @@ func (s *PublishSuite) TestCreateBundleFailCreate() {
 		State: state.NewDeployment(),
 	}
 	cmd.State.SourceDir = s.cwd
-	err := CreateBundleFromDirectory(cmd, dest, s.log)
+	publisher := New(cmd)
+	err := publisher.CreateBundleFromDirectory(dest, s.log)
 	s.ErrorIs(err, testError)
 }
 
@@ -83,7 +85,8 @@ func (s *PublishSuite) TestWriteManifest() {
 	}
 	cmd.State.SourceDir = s.cwd
 
-	err := WriteManifestFromDirectory(cmd, s.log)
+	publisher := New(cmd)
+	err := publisher.WriteManifestFromDirectory(s.log)
 	s.NoError(err)
 	s.True(manifestPath.Exists())
 
@@ -143,7 +146,9 @@ func (s *PublishSuite) publishWithClient(createErr, uploadErr, deployErr, waitEr
 	client.On("UploadBundle", myContentID, mock.Anything).Return(myBundleID, uploadErr)
 	client.On("DeployBundle", myContentID, myBundleID).Return(myTaskID, deployErr)
 	client.On("WaitForTask", myTaskID, mock.Anything).Return(waitErr)
-	err = publishWithClient(cmd, bundler, account, client, s.log)
+
+	publisher := New(cmd)
+	err = publisher.publishWithClient(bundler, account, client, s.log)
 	if expectedErr == nil {
 		s.NoError(err)
 	} else {
diff --git a/internal/services/api/publish.go b/internal/services/api/publish.go
index 9a79ac210..cfc8acbc8 100644
--- a/internal/services/api/publish.go
+++ b/internal/services/api/publish.go
@@ -9,7 +9,6 @@ import (
 	"github.com/rstudio/connect-client/internal/accounts"
 	"github.com/rstudio/connect-client/internal/cli_types"
 	"github.com/rstudio/connect-client/internal/logging"
-	"github.com/rstudio/connect-client/internal/publish"
 	"github.com/rstudio/connect-client/internal/state"
 )
 
@@ -17,9 +16,11 @@ type PublishReponse struct {
 	LocalID state.LocalDeploymentID `json:"local_id"` // Unique ID of this publishing operation. Only valid for this run of the agent.
 }
 
-var publishFn = publish.PublishManifestFiles
+type ManifestFilesPublisher interface {
+	PublishManifestFiles(lister accounts.AccountList, log logging.Logger) error
+}
 
-func PostPublishHandlerFunc(publishArgs *cli_types.PublishArgs, lister accounts.AccountList, log logging.Logger) http.HandlerFunc {
+func PostPublishHandlerFunc(publisher ManifestFilesPublisher, publishArgs *cli_types.PublishArgs, lister accounts.AccountList, log logging.Logger) http.HandlerFunc {
 	return func(w http.ResponseWriter, req *http.Request) {
 		localID, err := state.NewLocalID()
 		if err != nil {
@@ -36,7 +37,7 @@ func PostPublishHandlerFunc(publishArgs *cli_types.PublishArgs, lister accounts.
 
 		go func() {
 			log = log.WithArgs("local_id", localID)
-			err := publishFn(publishArgs, lister, log)
+			err := publisher.PublishManifestFiles(lister, log)
 			if err != nil {
 				log.Error("Deployment failed", "error", err.Error())
 			}
diff --git a/internal/services/api/publish_test.go b/internal/services/api/publish_test.go
index 193cffd05..04b50f11b 100644
--- a/internal/services/api/publish_test.go
+++ b/internal/services/api/publish_test.go
@@ -24,6 +24,19 @@ func TestPublishHandlerFuncSuite(t *testing.T) {
 	suite.Run(t, new(PublishHandlerFuncSuite))
 }
 
+type mockPublisher struct {
+	suite *PublishHandlerFuncSuite
+	args  *cli_types.PublishArgs
+}
+
+func (m *mockPublisher) PublishManifestFiles(lister accounts.AccountList, log logging.Logger) error {
+	m.suite.NotNil(m.args)
+	m.suite.NotNil(lister)
+	m.suite.NotNil(log)
+	m.suite.NotEqual(state.LocalDeploymentID(""), m.args.State.LocalID)
+	return nil
+}
+
 func (s *PublishHandlerFuncSuite) TestPublishHandlerFunc() {
 	publishArgs := &cli_types.PublishArgs{
 		State: state.NewDeployment(),
@@ -35,12 +48,12 @@ func (s *PublishHandlerFuncSuite) TestPublishHandlerFunc() {
 	req, err := http.NewRequest("POST", "/api/publish", nil)
 	s.NoError(err)
 
-	publishFn = func(args *cli_types.PublishArgs, lister accounts.AccountList, log logging.Logger) error {
-		s.NotNil(args)
-		s.NotEqual(state.LocalDeploymentID(""), args.State.LocalID)
-		return nil
+	publisher := &mockPublisher{
+		suite: s,
+		args:  publishArgs,
 	}
-	handler := PostPublishHandlerFunc(publishArgs, nil, log)
+	lister := &accounts.MockAccountList{}
+	handler := PostPublishHandlerFunc(publisher, publishArgs, lister, log)
 	handler(rec, req)
 
 	s.Equal(http.StatusAccepted, rec.Result().StatusCode)
diff --git a/internal/services/ui/ui_service.go b/internal/services/ui/ui_service.go
index 1784e35d5..82822fb73 100644
--- a/internal/services/ui/ui_service.go
+++ b/internal/services/ui/ui_service.go
@@ -9,6 +9,7 @@ import (
 	"github.com/rstudio/connect-client/internal/accounts"
 	"github.com/rstudio/connect-client/internal/cli_types"
 	"github.com/rstudio/connect-client/internal/logging"
+	"github.com/rstudio/connect-client/internal/publish"
 	"github.com/rstudio/connect-client/internal/services"
 	"github.com/rstudio/connect-client/internal/services/api"
 	"github.com/rstudio/connect-client/internal/services/api/deployments"
@@ -76,7 +77,8 @@ func RouterHandlerFunc(afs afero.Fs, publishArgs *cli_types.PublishArgs, lister
 		Methods(http.MethodPut)
 
 	// POST /api/publish
-	r.Handle(ToPath("publish"), api.PostPublishHandlerFunc(publishArgs, lister, log)).
+	publisher := publish.New(publishArgs)
+	r.Handle(ToPath("publish"), api.PostPublishHandlerFunc(publisher, publishArgs, lister, log)).
 		Methods(http.MethodPost)
 
 	// GET /

From 5dc3dd802ce9e1e8bae9018c70f704308402ff7b Mon Sep 17 00:00:00 2001
From: Bill Sager <whs@sager.org>
Date: Tue, 19 Sep 2023 09:11:32 -0700
Subject: [PATCH 22/33] add copyright header

---
 web/src/components/configurePublish/ConfigurePublish.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/src/components/configurePublish/ConfigurePublish.vue b/web/src/components/configurePublish/ConfigurePublish.vue
index eb1fd1a39..92d743d2b 100644
--- a/web/src/components/configurePublish/ConfigurePublish.vue
+++ b/web/src/components/configurePublish/ConfigurePublish.vue
@@ -1,3 +1,5 @@
+<!-- Copyright (C) 2023 by Posit Software, PBC. -->
+
 <template>
   <q-page
     class="max-width-md q-mx-auto"

From 778003ea6db1aaefae3f1c6533020cbbad3373d6 Mon Sep 17 00:00:00 2001
From: Bill Sager <whs@sager.org>
Date: Tue, 19 Sep 2023 13:33:30 -0700
Subject: [PATCH 23/33] switched to vue components to wrap svg icons

---
 web/.gitignore                                |   1 +
 web/public/images/files-icon.jpg              | Bin 14964 -> 0 bytes
 web/public/images/info.png                    | Bin 57388 -> 0 bytes
 .../images/posit-logo-only-unofficial.svg     |   1 -
 web/public/images/publisher-advanced.svg      |  27 --
 web/public/images/publisher-destination.svg   |  11 -
 web/public/images/publisher-folder.svg        |  10 -
 web/public/images/publisher-positlogo.svg     |  13 -
 web/public/images/publisher-python.svg        |  15 -
 web/public/images/publisher-settings.svg      |  29 --
 web/public/images/python-logo-only.svg        | 265 ------------------
 web/public/images/settings.png                | Bin 1303 -> 0 bytes
 web/src/App.vue                               |  10 +-
 .../configurePublish/AdvancedSettings.vue     |   5 +-
 .../configurePublish/CommonSettings.vue       |   5 +-
 .../configurePublish/DestinationTarget.vue    |   6 +-
 .../configurePublish/FilesToPublish.vue       |   6 +-
 .../configurePublish/LayoutPanel.vue          |   8 +-
 .../configurePublish/PythonProject.vue        |   5 +-
 .../icons/PublisherAdvancedLogo.vue           |  47 ++++
 .../icons/PublisherDestinationLogo.vue        |  31 ++
 .../components/icons/PublisherFolderLogo.vue  |  31 ++
 .../components/icons/PublisherPythonLogo.vue  |  45 +++
 .../icons/PublisherSettingsLogo.vue           |  49 ++++
 web/src/components/icons/WhitePositLogo.vue   |  99 +++----
 25 files changed, 272 insertions(+), 447 deletions(-)
 delete mode 100644 web/public/images/files-icon.jpg
 delete mode 100644 web/public/images/info.png
 delete mode 100644 web/public/images/posit-logo-only-unofficial.svg
 delete mode 100644 web/public/images/publisher-advanced.svg
 delete mode 100644 web/public/images/publisher-destination.svg
 delete mode 100644 web/public/images/publisher-folder.svg
 delete mode 100644 web/public/images/publisher-positlogo.svg
 delete mode 100644 web/public/images/publisher-python.svg
 delete mode 100644 web/public/images/publisher-settings.svg
 delete mode 100644 web/public/images/python-logo-only.svg
 delete mode 100644 web/public/images/settings.png
 create mode 100644 web/src/components/icons/PublisherAdvancedLogo.vue
 create mode 100644 web/src/components/icons/PublisherDestinationLogo.vue
 create mode 100644 web/src/components/icons/PublisherFolderLogo.vue
 create mode 100644 web/src/components/icons/PublisherPythonLogo.vue
 create mode 100644 web/src/components/icons/PublisherSettingsLogo.vue

diff --git a/web/.gitignore b/web/.gitignore
index a590335c7..0a05d9fab 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -26,3 +26,4 @@ dist-ssr
 
 .nyc_output
 coverage/
+vite.config.ts.*
\ No newline at end of file
diff --git a/web/public/images/files-icon.jpg b/web/public/images/files-icon.jpg
deleted file mode 100644
index 6b7fae2a369bfc5394444a630437b31fda8f3b39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14964
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
S<GTegA5B#~m3n2{$o~T#jX!_@

diff --git a/web/public/images/info.png b/web/public/images/info.png
deleted file mode 100644
index 26d6695ba1eccd9e152eb7094aaa2884b4286749..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 57388
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
FV1m$=&MN=_

diff --git a/web/public/images/posit-logo-only-unofficial.svg b/web/public/images/posit-logo-only-unofficial.svg
deleted file mode 100644
index 1110d5d6f..000000000
--- a/web/public/images/posit-logo-only-unofficial.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 182.52 182.52"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#ee6331;}.cls-3{fill:#447099;}</style></defs><g id="full-rgb"><path id="fullLogo-7" data-name="fullLogo" class="cls-1" d="M688.88,43.47h2.78L696,49.94l4.11-6.47h2.7V57h-3v-8.1l-3.51,5.38h-.79l-3.63-5.44V57h-3Z"/><polygon id="fullLogo-8" data-name="fullLogo" class="cls-2" points="38.03 73.11 46.16 69.52 82.91 53.28 90.93 49.74 179.72 10.51 179.72 57.83 143.82 73.11 135.7 69.52 173.24 53.54 173.24 20.47 98.95 53.28 90.93 56.83 54.33 73 46.21 76.59 20.31 88.03 20.31 96.52 45.81 107.79 53.93 111.38 91.5 127.97 99.47 131.49 173.24 164.08 173.24 130.66 136.1 114.86 144.22 111.27 179.72 126.38 179.72 174.04 91.53 135.07 83.56 131.55 45.76 114.86 37.64 111.27 13.82 100.74 13.82 83.81 38.03 73.11"/><polygon class="cls-2" points="99.2 92.1 135.65 76.59 127.52 73 82.64 92.1 127.92 111.38 136.04 107.79 99.2 92.1"/><polygon id="fullLogo-9" data-name="fullLogo" class="cls-3" points="45.81 107.79 53.93 111.38 90.93 95.63 82.65 92.1 45.81 107.79"/><polygon id="fullLogo-10" data-name="fullLogo" class="cls-3" points="54.33 73 46.21 76.59 82.65 92.1 90.93 88.58 54.33 73"/><polygon id="fullLogo-11" data-name="fullLogo" class="cls-3" points="143.82 73.11 135.7 69.52 98.95 53.28 90.93 49.74 2.14 10.51 2.14 57.83 38.03 73.11 46.16 69.52 8.62 53.54 8.62 20.47 82.91 53.28 90.93 56.83 127.53 73 135.65 76.59 161.55 88.03 161.55 96.52 136.05 107.79 127.93 111.38 90.36 127.97 82.39 131.49 8.62 164.08 8.62 130.66 45.76 114.86 37.64 111.27 2.14 126.38 2.14 174.04 90.33 135.07 98.3 131.55 136.1 114.86 144.22 111.27 168.04 100.74 168.04 83.81 143.82 73.11"/></g></svg>
diff --git a/web/public/images/publisher-advanced.svg b/web/public/images/publisher-advanced.svg
deleted file mode 100644
index 4d2233060..000000000
--- a/web/public/images/publisher-advanced.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
-<g>
-	<path fill="#d3d3d3" d="M41.5,38.6c-1.4,0.4-3.1,0.5-5.1,0.2c-2-0.3-4.2-0.9-6.7-1.9c-2.5-1-5.1-2.3-7.9-3.9c-2.8-1.6-5.2-3.2-7.3-4.9
-		c-2.1-1.7-3.7-3.3-5-4.9c-1.3-1.6-2.1-3.1-2.4-4.5c-0.3-1.4-0.2-2.7,0.5-3.8c0.7-1.1,1.7-1.9,3.1-2.3c1.4-0.4,3.1-0.5,5.1-0.2
-		c2,0.3,4.2,0.9,6.7,1.9s5.1,2.2,7.9,3.9c2.8,1.6,5.3,3.3,7.3,4.9c2.1,1.7,3.7,3.3,5,4.9c1.3,1.6,2.1,3.1,2.4,4.5
-		c0.3,1.4,0.2,2.7-0.4,3.8C43.9,37.5,42.9,38.2,41.5,38.6z M7,32.5c0.3-1.4,1.2-2.9,2.4-4.5s2.9-3.2,5-4.9c2.1-1.7,4.5-3.3,7.3-4.9
-		c2.8-1.6,5.4-2.9,7.9-3.9s4.7-1.6,6.7-1.9c2-0.3,3.7-0.2,5.1,0.2c1.4,0.4,2.4,1.2,3.1,2.3c0.6,1.1,0.8,2.4,0.5,3.8
-		c-0.3,1.4-1.1,2.9-2.4,4.5c-1.2,1.6-2.9,3.2-5,4.9c-2.1,1.7-4.5,3.3-7.3,4.9c-2.8,1.6-5.4,2.9-7.9,3.9c-2.5,1-4.7,1.6-6.7,1.9
-		c-2,0.3-3.7,0.2-5.1-0.2c-1.4-0.4-2.4-1.2-3.1-2.3C6.8,35.2,6.7,34,7,32.5z M41.8,31.3c-0.9-1.5-2.5-3.2-4.7-5
-		c-2.2-1.8-5-3.7-8.2-5.6c-3.3-1.9-6.2-3.3-8.9-4.3c-2.7-1-4.9-1.5-6.7-1.5c-1.8,0-3,0.5-3.5,1.5c-0.6,1-0.4,2.2,0.5,3.8
-		c0.9,1.5,2.5,3.2,4.7,5c2.2,1.8,4.9,3.7,8.2,5.5c3.3,1.9,6.3,3.4,9,4.4c2.7,1,4.9,1.5,6.7,1.5c1.8,0,2.9-0.5,3.5-1.5
-		C42.8,34,42.7,32.8,41.8,31.3z M13.3,36.5c1.8,0,4-0.5,6.7-1.5c2.7-1,5.7-2.5,9-4.4c3.3-1.9,6-3.7,8.2-5.5c2.2-1.8,3.7-3.5,4.6-5
-		c0.9-1.5,1.1-2.8,0.5-3.8c-0.6-1-1.8-1.5-3.5-1.5c-1.8,0-4,0.5-6.7,1.5c-2.7,1-5.6,2.4-8.9,4.3c-3.3,1.9-6.1,3.8-8.3,5.6
-		c-2.2,1.8-3.8,3.5-4.7,5C9.3,32.8,9.2,34,9.7,35C10.3,36,11.5,36.5,13.3,36.5z M22.5,45.3c-1.1-1-2-2.5-2.7-4.3
-		c-0.8-1.9-1.3-4.1-1.7-6.8c-0.4-2.6-0.6-5.6-0.6-8.8c0-3.2,0.2-6.2,0.6-8.8c0.4-2.6,1-4.9,1.7-6.7c0.8-1.9,1.7-3.3,2.7-4.3
-		c1.1-1,2.2-1.5,3.5-1.5c1.3,0,2.5,0.5,3.5,1.5c1.1,1,2,2.5,2.7,4.3c0.8,1.9,1.3,4.1,1.7,6.7c0.4,2.6,0.6,5.5,0.6,8.8
-		c0,3.2-0.2,6.2-0.6,8.8c-0.4,2.6-1,4.9-1.7,6.8c-0.8,1.9-1.7,3.3-2.7,4.3c-1.1,1-2.2,1.5-3.5,1.5C24.7,46.9,23.5,46.4,22.5,45.3z
-		 M29,41.9c0.9-1.6,1.5-3.7,2-6.6c0.5-2.8,0.7-6.1,0.7-9.9c0-3.8-0.2-7.1-0.7-9.9c-0.5-2.8-1.2-5-2-6.5c-0.9-1.5-1.9-2.3-3-2.3
-		c-1.2,0-2.2,0.8-3,2.3c-0.9,1.5-1.5,3.7-2,6.5c-0.5,2.8-0.7,6.1-0.7,9.9c0,3.8,0.2,7.1,0.7,9.9c0.5,2.8,1.1,5,2,6.6
-		c0.9,1.6,1.9,2.3,3,2.3C27.2,44.3,28.2,43.5,29,41.9z M23.3,28.1c-0.7-0.7-1.1-1.6-1.1-2.7c0-1,0.4-1.9,1.1-2.7
-		c0.7-0.7,1.6-1.1,2.7-1.1c1,0,1.9,0.4,2.7,1.1c0.7,0.7,1.1,1.6,1.1,2.7c0,1.1-0.4,1.9-1.1,2.7c-0.7,0.7-1.6,1.1-2.7,1.1
-		C25,29.2,24.1,28.9,23.3,28.1z"/>
-</g>
-</svg>
diff --git a/web/public/images/publisher-destination.svg b/web/public/images/publisher-destination.svg
deleted file mode 100644
index 44c8ee787..000000000
--- a/web/public/images/publisher-destination.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
-<g>
-	<path fill="#d3d3d3" d="M9.5,43.3V12.4c0-1.7,0.8-2.7,2.1-3.3c1.5-0.7,2.8-1,5.6-1c6.8,0,11.4,3.4,17.9,3.4c3,0,4.7-0.7,5.7-0.7
-		c1.2,0,2.2,0.8,2.2,2v18.6c0,1.7-0.8,2.8-2.1,3.4c-1.5,0.7-2.7,1-5.6,1c-6.6,0-11.1-3.4-17.9-3.4c-2.4,0-4,0.6-4.5,0.8v10.2
-		c0,0.9-0.8,1.7-1.7,1.7S9.5,44.2,9.5,43.3z M39.5,30.9V14.4c-1.2,0.3-2.7,0.5-4.5,0.5c-6.7,0-11.4-3.4-17.7-3.4
-		c-2.6,0-4,0.7-4.3,1.3v16.6c1-0.4,2.6-0.6,4.5-0.6c7.1,0,11.7,3.4,17.7,3.4C37.8,32.2,39.2,31.5,39.5,30.9z"/>
-</g>
-</svg>
diff --git a/web/public/images/publisher-folder.svg b/web/public/images/publisher-folder.svg
deleted file mode 100644
index 0214b862c..000000000
--- a/web/public/images/publisher-folder.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
-
-<path fill="#d3d3d3" fill-rule="evenodd" clip-rule="evenodd" d="M48.3,15.7c0-4-2.2-5.4-5.4-5.4c-3.3,0-17.4,0-19.7,0S20,6.3,15.6,6.3
-	c-4.4,0-5.3,0-7.6,0c-5.2,0-4.7,6.5-4.7,6.5c0,3.3,0,21.1,0,23.9C3.3,40,5,43,9.7,43c5.6,0,28.7,0.1,32.9,0.1c3.7,0,5.7-1.3,5.7-5.4
-	C48.3,31.2,48.3,19.6,48.3,15.7z M40.6,40c-3.7,0-23.9-0.1-28.8-0.1c-4.4,0-5.2-1.4-5.2-4.8c0-2.8-0.1-20.5,0-22.6s0.5-2.8,2.9-2.8
-	c2,0,4.4,0,5.4,0c3.5,0,3.8,3.8,6.9,3.8c0.7,0,16,0,18.9,0s4.2,0.3,4.2,4.1c0,3.3,0,13,0,18.5C44.9,39.8,43.8,40,40.6,40z"/>
-</svg>
diff --git a/web/public/images/publisher-positlogo.svg b/web/public/images/publisher-positlogo.svg
deleted file mode 100644
index 19c18d07c..000000000
--- a/web/public/images/publisher-positlogo.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
-<g>
-	<path fill="#d3d3d3" d="M5.4,9.8l35.3,15.6v0.9L5.4,42.1v-6.3l17.9-7.7l5.3-2.3l-5.3-2.3L5.4,15.8L5.4,9.8 M2.9,5.9l0,11.5l19.4,8.4L2.9,34.2V46
-		l40.3-18.1v-4.2L2.9,5.9L2.9,5.9z"/>
-</g>
-<g>
-	<path fill="#d3d3d3" d="M46.6,9.8l0,6l-17.9,7.7l-5.3,2.3l5.3,2.3l17.9,7.7v6.3L11.3,26.3v-0.9L46.6,9.8 M49.1,5.9L8.8,23.7v4.2L49.1,46V34.2
-		l-19.4-8.4l19.4-8.4L49.1,5.9L49.1,5.9z"/>
-</g>
-</svg>
diff --git a/web/public/images/publisher-python.svg b/web/public/images/publisher-python.svg
deleted file mode 100644
index e9a393c9c..000000000
--- a/web/public/images/publisher-python.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
-
-<path id="path1948" fill="#d3d3d3" stroke="#000000" stroke-width="2.5" stroke-linejoin="round" stroke-miterlimit="10" d="M26.3,6
-	c-1.7,0-3.3,0.2-4.7,0.4c-4.2,0.7-4.9,2.3-4.9,5.1v3.7h9.8v1.2h-9.8H13c-2.9,0-5.3,1.7-6.1,5c-0.9,3.7-0.9,6.1,0,10
-	c0.7,2.9,2.4,5,5.2,5h3.4v-4.5c0-3.2,2.8-6.1,6.1-6.1h9.8c2.7,0,4.9-2.2,4.9-5v-9.3c0-2.7-2.2-4.7-4.9-5.1C29.7,6.1,28,6,26.3,6z
-	 M21,9.9c0.6,0,1,0.4,1,1c0,0.6-0.4,1-1,1c-0.6,0-1-0.4-1-1C20,10.3,20.4,9.9,21,9.9z"/>
-
-<path id="path1950" fill="#d3d3d3" stroke="#000000" stroke-width="2.5" stroke-linejoin="round" stroke-miterlimit="10" d="M37.5,16.5
-	v4.4c0,3.4-2.9,6.2-6.1,6.2h-9.8c-2.7,0-4.9,2.3-4.9,5v9.3c0,2.7,2.3,4.2,4.9,5c3.1,0.9,6.1,1.1,9.8,0c2.5-0.7,4.9-2.2,4.9-5v-3.7
-	h-9.8v-1.2h9.8h4.9c2.9,0,3.9-2,4.9-5c1-3.1,1-6,0-10c-0.7-2.8-2.1-5-4.9-5L37.5,16.5z M31.2,41c0.6,0,1,0.4,1,1c0,0.6-0.4,1-1,1
-	c-0.6,0-1-0.4-1-1C30.2,41.4,30.6,41,31.2,41z"/>
-</svg>
diff --git a/web/public/images/publisher-settings.svg b/web/public/images/publisher-settings.svg
deleted file mode 100644
index 7fc0b8fde..000000000
--- a/web/public/images/publisher-settings.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 52 52" enable-background="new 0 0 52 52" xml:space="preserve">
-<g>
-	<path fill="#d3d3d3" d="M22.1,45.9c-0.5-0.4-0.9-1-1-1.7l-0.8-3.6l-0.6-0.2l-3.1,1.9c-0.6,0.4-1.3,0.5-2,0.5c-0.7-0.1-1.3-0.4-1.8-0.9L10,39.2
-		c-0.5-0.5-0.8-1.1-0.9-1.8c-0.1-0.7,0.1-1.3,0.5-1.9l1.9-3.1l-0.2-0.6L7.7,31C7,30.8,6.4,30.4,6,29.9c-0.4-0.5-0.6-1.2-0.6-1.9
-		v-3.8c0-0.7,0.2-1.4,0.6-1.9c0.4-0.5,1-0.9,1.7-1.1l3.5-0.9l0.2-0.6l-1.9-3.1C9.1,16,9,15.4,9.1,14.7c0.1-0.7,0.4-1.3,0.9-1.8
-		l2.7-2.7c0.5-0.5,1.1-0.8,1.8-0.9s1.3,0.1,1.9,0.4l3.1,1.9l0.7-0.2L21,7.9c0.2-0.7,0.5-1.3,1-1.7c0.5-0.4,1.2-0.6,1.9-0.6h3.9
-		c0.7,0,1.4,0.2,1.9,0.6c0.5,0.4,0.9,1,1,1.7l0.8,3.6l0.7,0.2l3.1-1.9c0.6-0.4,1.3-0.5,1.9-0.4s1.3,0.4,1.8,0.9l2.7,2.7
-		c0.5,0.5,0.8,1.1,0.9,1.8c0.1,0.7-0.1,1.3-0.5,1.9l-2,3.1l0.2,0.6l3.5,0.9c0.7,0.2,1.3,0.5,1.7,1.1c0.4,0.5,0.6,1.2,0.6,1.9V28
-		c0,0.7-0.2,1.4-0.6,1.9c-0.4,0.5-1,0.9-1.7,1.1l-3.6,0.8l-0.2,0.6l2,3.1c0.4,0.6,0.6,1.3,0.5,1.9c-0.1,0.7-0.4,1.3-0.9,1.8
-		l-2.7,2.7c-0.5,0.5-1.1,0.8-1.8,0.9c-0.7,0.1-1.3-0.1-1.9-0.5l-3.1-1.9l-0.6,0.2l-0.8,3.6c-0.2,0.7-0.5,1.3-1,1.7
-		c-0.5,0.4-1.2,0.6-1.9,0.6H24C23.2,46.6,22.6,46.4,22.1,45.9z M27.5,43.6c0.3,0,0.5-0.1,0.5-0.4l1.2-4.8c0.6-0.1,1.1-0.3,1.7-0.5
-		c0.5-0.2,1-0.5,1.4-0.7l4.2,2.6c0.2,0.2,0.5,0.1,0.7-0.1l2.2-2.3c0.2-0.2,0.2-0.4,0.1-0.7L37,32.5c0.2-0.4,0.5-0.9,0.7-1.4
-		c0.2-0.5,0.4-1.1,0.6-1.7l4.8-1.1c0.3-0.1,0.4-0.2,0.4-0.6v-3.2c0-0.3-0.1-0.5-0.4-0.6l-4.8-1.2c-0.2-0.6-0.4-1.2-0.6-1.7
-		c-0.2-0.5-0.5-1-0.6-1.3l2.6-4.1c0.2-0.3,0.2-0.5-0.1-0.7l-2.3-2.2c-0.2-0.2-0.5-0.2-0.7-0.1L32.3,15c-0.4-0.2-0.9-0.5-1.4-0.7
-		c-0.5-0.2-1.1-0.4-1.7-0.6L28.1,9c0-0.3-0.2-0.4-0.5-0.4h-3.3c-0.3,0-0.5,0.1-0.6,0.4l-1.1,4.8c-0.6,0.2-1.1,0.3-1.7,0.6
-		c-0.6,0.2-1,0.5-1.4,0.7l-4.1-2.5c-0.3-0.1-0.5-0.1-0.7,0.1l-2.3,2.2c-0.2,0.2-0.2,0.5-0.1,0.7l2.6,4.1c-0.2,0.4-0.4,0.8-0.6,1.3
-		c-0.2,0.5-0.5,1.1-0.6,1.7l-4.7,1.2c-0.3,0.1-0.4,0.2-0.4,0.6v3.2c0,0.3,0.1,0.5,0.4,0.6l4.8,1.1c0.2,0.6,0.3,1.1,0.6,1.7
-		c0.2,0.5,0.5,1,0.7,1.4l-2.6,4.1c-0.2,0.3-0.1,0.5,0.1,0.7l2.3,2.3c0.2,0.2,0.5,0.3,0.7,0.1l4.2-2.6c0.4,0.3,0.9,0.5,1.4,0.7
-		c0.5,0.2,1.1,0.4,1.7,0.5l1.2,4.8c0.1,0.3,0.2,0.4,0.6,0.4H27.5z M22.2,32.4c-1.1-0.7-2-1.6-2.7-2.7s-1-2.3-1-3.7
-		c0-1.3,0.3-2.5,1-3.7s1.6-2,2.7-2.6c1.1-0.7,2.3-1,3.7-1c1.3,0,2.6,0.3,3.7,1c1.1,0.7,2,1.5,2.6,2.6c0.7,1.1,1,2.3,1,3.7
-		c0,1.3-0.3,2.6-1,3.7c-0.7,1.1-1.5,2-2.6,2.7c-1.1,0.7-2.3,1-3.7,1C24.6,33.4,23.3,33,22.2,32.4z M28.1,29.8
-		c0.7-0.4,1.2-0.9,1.6-1.6c0.4-0.7,0.6-1.4,0.6-2.2c0-0.8-0.2-1.5-0.6-2.2c-0.4-0.7-0.9-1.2-1.6-1.6c-0.7-0.4-1.4-0.6-2.1-0.6
-		c-0.8,0-1.5,0.2-2.2,0.6s-1.2,0.9-1.6,1.6c-0.4,0.7-0.6,1.4-0.6,2.2c0,0.8,0.2,1.5,0.6,2.2c0.4,0.7,0.9,1.2,1.6,1.6
-		s1.4,0.6,2.2,0.6C26.7,30.4,27.4,30.2,28.1,29.8z"/>
-</g>
-</svg>
diff --git a/web/public/images/python-logo-only.svg b/web/public/images/python-logo-only.svg
deleted file mode 100644
index 467b07b26..000000000
--- a/web/public/images/python-logo-only.svg
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   version="1.0"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
-   sodipodi:docname="python-logo-only.svg"
-   width="83.371017pt"
-   height="101.00108pt"
-   inkscape:export-filename="python-logo-only.png"
-   inkscape:export-xdpi="232.44"
-   inkscape:export-ydpi="232.44"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <metadata
-     id="metadata371">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="2080"
-     inkscape:window-width="1976"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="2.1461642"
-     inkscape:cx="91.558698"
-     inkscape:cy="47.9926"
-     inkscape:window-x="1092"
-     inkscape:window-y="72"
-     inkscape:current-layer="svg2"
-     width="210mm"
-     height="40mm"
-     units="mm"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="pt"
-     showgrid="false"
-     inkscape:window-maximized="0" />
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient2795">
-      <stop
-         style="stop-color:#b8b8b8;stop-opacity:0.49803922;"
-         offset="0"
-         id="stop2797" />
-      <stop
-         style="stop-color:#7f7f7f;stop-opacity:0;"
-         offset="1"
-         id="stop2799" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2787">
-      <stop
-         style="stop-color:#7f7f7f;stop-opacity:0.5;"
-         offset="0"
-         id="stop2789" />
-      <stop
-         style="stop-color:#7f7f7f;stop-opacity:0;"
-         offset="1"
-         id="stop2791" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3676">
-      <stop
-         style="stop-color:#b2b2b2;stop-opacity:0.5;"
-         offset="0"
-         id="stop3678" />
-      <stop
-         style="stop-color:#b3b3b3;stop-opacity:0;"
-         offset="1"
-         id="stop3680" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3236">
-      <stop
-         style="stop-color:#f4f4f4;stop-opacity:1"
-         offset="0"
-         id="stop3244" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop3240" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4671">
-      <stop
-         style="stop-color:#ffd43b;stop-opacity:1;"
-         offset="0"
-         id="stop4673" />
-      <stop
-         style="stop-color:#ffe873;stop-opacity:1"
-         offset="1"
-         id="stop4675" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4689">
-      <stop
-         style="stop-color:#5a9fd4;stop-opacity:1;"
-         offset="0"
-         id="stop4691" />
-      <stop
-         style="stop-color:#306998;stop-opacity:1;"
-         offset="1"
-         id="stop4693" />
-    </linearGradient>
-    <linearGradient
-       x1="224.23996"
-       y1="144.75717"
-       x2="-65.308502"
-       y2="144.75717"
-       id="linearGradient2987"
-       xlink:href="#linearGradient4671"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(100.2702,99.61116)" />
-    <linearGradient
-       x1="172.94208"
-       y1="77.475983"
-       x2="26.670298"
-       y2="76.313133"
-       id="linearGradient2990"
-       xlink:href="#linearGradient4689"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(100.2702,99.61116)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4689"
-       id="linearGradient2587"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(100.2702,99.61116)"
-       x1="172.94208"
-       y1="77.475983"
-       x2="26.670298"
-       y2="76.313133" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4671"
-       id="linearGradient2589"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(100.2702,99.61116)"
-       x1="224.23996"
-       y1="144.75717"
-       x2="-65.308502"
-       y2="144.75717" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4689"
-       id="linearGradient2248"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(100.2702,99.61116)"
-       x1="172.94208"
-       y1="77.475983"
-       x2="26.670298"
-       y2="76.313133" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4671"
-       id="linearGradient2250"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(100.2702,99.61116)"
-       x1="224.23996"
-       y1="144.75717"
-       x2="-65.308502"
-       y2="144.75717" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4671"
-       id="linearGradient2255"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.562541,0,0,0.567972,-11.5974,-7.60954)"
-       x1="224.23996"
-       y1="144.75717"
-       x2="-65.308502"
-       y2="144.75717" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4689"
-       id="linearGradient2258"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.562541,0,0,0.567972,-11.5974,-7.60954)"
-       x1="172.94208"
-       y1="76.176224"
-       x2="26.670298"
-       y2="76.313133" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2795"
-       id="radialGradient2801"
-       cx="61.518883"
-       cy="132.28575"
-       fx="61.518883"
-       fy="132.28575"
-       r="29.036913"
-       gradientTransform="matrix(1,0,0,0.177966,0,108.7434)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4671"
-       id="linearGradient1475"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.562541,0,0,0.567972,-14.99112,-11.702371)"
-       x1="150.96111"
-       y1="192.35176"
-       x2="112.03144"
-       y2="137.27299" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4689"
-       id="linearGradient1478"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.562541,0,0,0.567972,-14.99112,-11.702371)"
-       x1="26.648937"
-       y1="20.603781"
-       x2="135.66525"
-       y2="114.39767" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2795"
-       id="radialGradient1480"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7490565e-8,-0.23994696,1.054668,3.7915457e-7,-83.7008,142.46201)"
-       cx="61.518883"
-       cy="132.28575"
-       fx="61.518883"
-       fy="132.28575"
-       r="29.036913" />
-  </defs>
-  <path
-     style="fill:url(#linearGradient1478);fill-opacity:1"
-     d="M 54.918785,9.1927421e-4 C 50.335132,0.02221727 45.957846,0.41313697 42.106285,1.0946693 30.760069,3.0991731 28.700036,7.2947714 28.700035,15.032169 v 10.21875 h 26.8125 v 3.40625 h -26.8125 -10.0625 c -7.792459,0 -14.6157588,4.683717 -16.7499998,13.59375 -2.46181998,10.212966 -2.57101508,16.586023 0,27.25 1.9059283,7.937852 6.4575432,13.593748 14.2499998,13.59375 h 9.21875 v -12.25 c 0,-8.849902 7.657144,-16.656248 16.75,-16.65625 h 26.78125 c 7.454951,0 13.406253,-6.138164 13.40625,-13.625 v -25.53125 c 0,-7.2663386 -6.12998,-12.7247771 -13.40625,-13.9374997 C 64.281548,0.32794397 59.502438,-0.02037903 54.918785,9.1927421e-4 Z m -14.5,8.21875012579 c 2.769547,0 5.03125,2.2986456 5.03125,5.1249996 -2e-6,2.816336 -2.261703,5.09375 -5.03125,5.09375 -2.779476,-1e-6 -5.03125,-2.277415 -5.03125,-5.09375 -10e-7,-2.826353 2.251774,-5.1249996 5.03125,-5.1249996 z"
-     id="path1948" />
-  <path
-     style="fill:url(#linearGradient1475);fill-opacity:1"
-     d="m 85.637535,28.657169 v 11.90625 c 0,9.230755 -7.825895,16.999999 -16.75,17 h -26.78125 c -7.335833,0 -13.406249,6.278483 -13.40625,13.625 v 25.531247 c 0,7.266344 6.318588,11.540324 13.40625,13.625004 8.487331,2.49561 16.626237,2.94663 26.78125,0 6.750155,-1.95439 13.406253,-5.88761 13.40625,-13.625004 V 86.500919 h -26.78125 v -3.40625 h 26.78125 13.406254 c 7.792461,0 10.696251,-5.435408 13.406241,-13.59375 2.79933,-8.398886 2.68022,-16.475776 0,-27.25 -1.92578,-7.757441 -5.60387,-13.59375 -13.406241,-13.59375 z m -15.0625,64.65625 c 2.779478,3e-6 5.03125,2.277417 5.03125,5.093747 -2e-6,2.826354 -2.251775,5.125004 -5.03125,5.125004 -2.76955,0 -5.03125,-2.29865 -5.03125,-5.125004 2e-6,-2.81633 2.261697,-5.093747 5.03125,-5.093747 z"
-     id="path1950" />
-  <ellipse
-     style="opacity:0.44382;fill:url(#radialGradient1480);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:15.4174;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path1894"
-     cx="55.816761"
-     cy="127.70079"
-     rx="35.930977"
-     ry="6.9673119" />
-</svg>
diff --git a/web/public/images/settings.png b/web/public/images/settings.png
deleted file mode 100644
index 1173e418221b1d643e5d8b3ccf264d4f8c904f64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1303
zcmV+y1?c*TP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkS$w@>(RCt{2o6CzFMI6UxjY2kiNDvQ#5A+W(i-wp*r>Y^~!N)ma
zccbRw!9>9jBp4SQh>u{rh%fLJFzQJRW~XX41X;v@2Srcf<02^HL6eyI)n*}*`O0sm
zdr~_)(_7usuj%X;3Wlz(n)-eESM~dKb$6v=3BVM90{{+{w6JYEY@6Exumym|wWB(K
z%{G8*$@oC?w%Z4~0^kIIqa`hDTg$R{I|Ddq9XL@bxd41@*?WKw)T{%wO3Ag#UaSMa
zKo0<L9e~*ags-?|4}h`Q9)L~<qpsOu0Ms!0swD;BYyrZUYdM<+fLdil6v-y61Hifm
zV8|)phs!<v!cHD-GM@ri87^0Zojls)0iYIju}rhgIslZ+0|0CSFazL>)rNmh1DGha
z2LRX#;1>+m9{?sx2>_idA7*@@p8<?#4ge8dGX?<eJJ3G>j#=q0|2}8c@6HqeVz_1u
z0CUzkFZZc`#j2mn3;<%fW|;uY#Bt3S0C*||;y#a9n;l1Tn*xY=WnuuB@TbyR`YF>z
z5E%jR&ztn8Qkd~~x%QnDfay4{83%xW?l||;C)(`lx5i`vU?Prd#sv_yO;%xWGOBBq
z3P2p!EFFND^Ld!;(RDvyuXWzzg#m!!v&S+2LCwq>J3<=(JmHrOg#dsAvd1KpCxDq@
zvqxLozQYY(-8?F_ITRGpFwcsHxu>WA=7vq4YzbvPmD-@U2u1%@b<+zO>wfEh_KhR}
zv2f`&si@TtfDhq|kg<;Y|HWlvmH>v%9=iY(JvGSqPN7Q=oDPpDPJ>6X0EW&U+s4-~
z-Y2yAH5`C}(Dbf%^1_zF0En7BR_jYUq@udiG%pm@s>(bfwD}~=^;bhMe@orm$BU&<
z=53+OqR{5GZKtrw9#kzW0Iu1iS2s5cZ7#SP8np;TALItWrHxc{JT2qfMNx}AtWrb(
z9LJ@mE2#qLc)>Rn&L)cnpfm4XjW8s&`AjN$RVeei(DZFY5Dyg)fceqUjgL<){Ci_>
zzp~L3LeXz-0Gin)LauFuGS4{-{>`wycg`=}A{G4^4$xfWgsN}=cwP!kAB9}`-@Qd_
z>;gNzd}meD(_Vw7y+vGq6(sErng7c|(ayp~0X9Tv`l0XOHN6y^cmIN!6pD;hr`rpg
z--lG@+(6fN83^0~B>u9)z{RjmyR38G?{m)G-Fj`l>I<=99!?s-n9D{*ls1C^uxnp6
zklyR9XRiqAg)(1f0w8IHO#!K?dnZ}dwABxV0UQ-f0p2f=+MLg13M8tCi=fw7zJnJ*
z_6&Ow<V7*FMKDQ8Wez(eKyQWh;pwGYg{Hrf4ufY>dZSzR0B}l#*h{=q&6|3S=PS!z
zl13twmM#Ohy$e9oyxZX0u55&&&p8#A+PonYeec@V_kstD@Vfj807bhQ8uLR{T5ol~
z2tcfIV@)5X3P4dyEG*rdYp4rTVKzka6kj2!>7>6VyfDm`m{jI5sp%c5&6iTqvED7Q
zgQN7>TpF9AQx<@h|6N_4A3E*reV(@pf};J2ZHu$~Z)uC9Co3sE80jkjoB3N>j0k|R
zM`Kda<*-L%Yk}Af;F+91cv^D`u=r+2Xqx5y0ioz97pcwj_U*8X{s$Ej9eMYZ*-HQb
N002ovPDHLkV1jRNRXzX!

diff --git a/web/src/App.vue b/web/src/App.vue
index 582635f2f..16ec6893c 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -10,13 +10,13 @@
       class="bg-primary text-white"
     >
       <q-toolbar class="max-width-md q-pa-none">
-        <!-- <WhitePositLogo
+        <AppMenu />
+        <WhitePositLogo
           class="posit-logo"
           alt="Posit PBC Logo"
-        /> -->
-        <AppMenu />
+        />
         <q-toolbar-title class="q-pl-xs">
-          Posit Publisher
+          Publisher
         </q-toolbar-title>
       </q-toolbar>
     </q-header>
@@ -41,7 +41,7 @@ import { ref } from 'vue';
 import AppMenu from 'src/components/AppMenu.vue';
 import ConfigurePublish from 'src/components/configurePublish/ConfigurePublish.vue';
 import PublishProcess from 'src/components/publishProcess/PublishProcess.vue';
-// import WhitePositLogo from 'src/components/icons/WhitePositLogo.vue';
+import WhitePositLogo from 'src/components/icons/WhitePositLogo.vue';
 
 import { useApi } from 'src/api';
 import { useDeploymentStore } from 'src/stores/deployment';
diff --git a/web/src/components/configurePublish/AdvancedSettings.vue b/web/src/components/configurePublish/AdvancedSettings.vue
index cca067db7..6364680dc 100644
--- a/web/src/components/configurePublish/AdvancedSettings.vue
+++ b/web/src/components/configurePublish/AdvancedSettings.vue
@@ -3,8 +3,10 @@
 <template>
   <LayoutPanel
     title="Advanced Settings"
-    icon="img:images/publisher-advanced.svg"
   >
+    <template #avatar>
+      <PublisherAdvancedLogo />
+    </template>
     TODO: Show list of editable settings (and some as read-only)
     based on capabilities of target server.
   </LayoutPanel>
@@ -12,4 +14,5 @@
 
 <script setup lang="ts">
 import LayoutPanel from 'src/components/configurePublish/LayoutPanel.vue';
+import PublisherAdvancedLogo from 'src/components/icons/PublisherAdvancedLogo.vue';
 </script>
diff --git a/web/src/components/configurePublish/CommonSettings.vue b/web/src/components/configurePublish/CommonSettings.vue
index f7210dcc5..23f8444da 100644
--- a/web/src/components/configurePublish/CommonSettings.vue
+++ b/web/src/components/configurePublish/CommonSettings.vue
@@ -3,13 +3,16 @@
 <template>
   <LayoutPanel
     title="Common Settings"
-    icon="img:images/publisher-settings.svg"
   >
+    <template #avatar>
+      <PublisherSettingsLogo />
+    </template>
     TODO: Common settings, probably off the info panel in dashboard
   </LayoutPanel>
 </template>
 
 <script setup lang="ts">
 import LayoutPanel from 'src/components/configurePublish/LayoutPanel.vue';
+import PublisherSettingsLogo from 'src/components/icons/PublisherSettingsLogo.vue';
 </script>
 
diff --git a/web/src/components/configurePublish/DestinationTarget.vue b/web/src/components/configurePublish/DestinationTarget.vue
index e6385d438..981169d72 100644
--- a/web/src/components/configurePublish/DestinationTarget.vue
+++ b/web/src/components/configurePublish/DestinationTarget.vue
@@ -4,8 +4,10 @@
   <LayoutPanel
     title="Destination"
     :subtitle="destinationTitle"
-    icon="img:images/publisher-destination.svg"
   >
+    <template #avatar>
+      <PublisherDestinationLogo />
+    </template>
     TODO: select from previous deployments or add to existing or new targets
   </LayoutPanel>
 </template>
@@ -14,6 +16,8 @@
 import { computed } from 'vue';
 
 import LayoutPanel from 'src/components/configurePublish/LayoutPanel.vue';
+import PublisherDestinationLogo from 'src/components/icons/PublisherDestinationLogo.vue';
+
 import { useDeploymentStore } from 'src/stores/deployment';
 
 const deploymentStore = useDeploymentStore();
diff --git a/web/src/components/configurePublish/FilesToPublish.vue b/web/src/components/configurePublish/FilesToPublish.vue
index 10de98e7a..00ac424f2 100644
--- a/web/src/components/configurePublish/FilesToPublish.vue
+++ b/web/src/components/configurePublish/FilesToPublish.vue
@@ -4,8 +4,10 @@
   <LayoutPanel
     title="Files"
     :subtitle="fileSummary"
-    icon="img:images/publisher-folder.svg"
   >
+    <template #avatar>
+      <PublisherFolderLogo />
+    </template>
     <q-tree
       v-model:ticked="deploymentStore.files"
       v-model:expanded="expanded"
@@ -23,6 +25,8 @@ import type { QTree, QTreeNode } from 'quasar';
 import { ref, computed } from 'vue';
 
 import LayoutPanel from 'src/components/configurePublish/LayoutPanel.vue';
+import PublisherFolderLogo from 'src/components/icons/PublisherFolderLogo.vue';
+
 import { useApi, DeploymentFile } from 'src/api';
 import { useDeploymentStore } from 'src/stores/deployment';
 
diff --git a/web/src/components/configurePublish/LayoutPanel.vue b/web/src/components/configurePublish/LayoutPanel.vue
index 67ca039ed..d15596a14 100644
--- a/web/src/components/configurePublish/LayoutPanel.vue
+++ b/web/src/components/configurePublish/LayoutPanel.vue
@@ -12,11 +12,7 @@
         avatar
         class="q-ml-sm"
       >
-        <q-icon
-          :name="props.icon"
-          :style="props.iconStyle"
-          size="35px"
-        />
+        <slot name="avatar" />
       </q-item-section>
 
       <q-item-section>
@@ -50,8 +46,6 @@
 const props = defineProps({
   title: { type: String, required: true },
   subtitle: { type: String, required: false, default: null },
-  icon: { type: String, required: true },
-  iconStyle: { type: String, required: false, default: '' },
   tooltip: { type: String, required: false, default: null },
   defaultOpen: { type: Boolean, required: false, default: false },
   expandIcon: { type: String, required: false, default: null },
diff --git a/web/src/components/configurePublish/PythonProject.vue b/web/src/components/configurePublish/PythonProject.vue
index e33e7254b..05c027623 100644
--- a/web/src/components/configurePublish/PythonProject.vue
+++ b/web/src/components/configurePublish/PythonProject.vue
@@ -3,8 +3,10 @@
 <template>
   <LayoutPanel
     title="Python"
-    icon="img:images/publisher-python.svg"
   >
+    <template #avatar>
+      <PublisherPythonLogo />
+    </template>
     TODO: Show detailed python version and list of package dependencies
     with ability to add or remove package dependencies.
   </LayoutPanel>
@@ -12,5 +14,6 @@
 
 <script setup lang="ts">
 import LayoutPanel from 'src/components/configurePublish/LayoutPanel.vue';
+import PublisherPythonLogo from 'src/components/icons/PublisherPythonLogo.vue';
 </script>
 
diff --git a/web/src/components/icons/PublisherAdvancedLogo.vue b/web/src/components/icons/PublisherAdvancedLogo.vue
new file mode 100644
index 000000000..d27df411a
--- /dev/null
+++ b/web/src/components/icons/PublisherAdvancedLogo.vue
@@ -0,0 +1,47 @@
+<!-- Copyright (C) 2023 by Posit Software, PBC. -->
+
+<template>
+  <svg
+    id="advanced"
+    version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    class="cls-1"
+    x="0px"
+    y="0px"
+    viewBox="0 0 52 52"
+    enable-background="new 0 0 52 52"
+    xml:space="preserve"
+  >
+    <g>
+      <path
+        d="M41.5,38.6c-1.4,0.4-3.1,0.5-5.1,0.2c-2-0.3-4.2-0.9-6.7-1.9c-2.5-1-5.1-2.3-7.9-3.9c-2.8-1.6-5.2-3.2-7.3-4.9
+        c-2.1-1.7-3.7-3.3-5-4.9c-1.3-1.6-2.1-3.1-2.4-4.5c-0.3-1.4-0.2-2.7,0.5-3.8c0.7-1.1,1.7-1.9,3.1-2.3c1.4-0.4,3.1-0.5,5.1-0.2
+        c2,0.3,4.2,0.9,6.7,1.9s5.1,2.2,7.9,3.9c2.8,1.6,5.3,3.3,7.3,4.9c2.1,1.7,3.7,3.3,5,4.9c1.3,1.6,2.1,3.1,2.4,4.5
+        c0.3,1.4,0.2,2.7-0.4,3.8C43.9,37.5,42.9,38.2,41.5,38.6z M7,32.5c0.3-1.4,1.2-2.9,2.4-4.5s2.9-3.2,5-4.9c2.1-1.7,4.5-3.3,7.3-4.9
+        c2.8-1.6,5.4-2.9,7.9-3.9s4.7-1.6,6.7-1.9c2-0.3,3.7-0.2,5.1,0.2c1.4,0.4,2.4,1.2,3.1,2.3c0.6,1.1,0.8,2.4,0.5,3.8
+        c-0.3,1.4-1.1,2.9-2.4,4.5c-1.2,1.6-2.9,3.2-5,4.9c-2.1,1.7-4.5,3.3-7.3,4.9c-2.8,1.6-5.4,2.9-7.9,3.9c-2.5,1-4.7,1.6-6.7,1.9
+        c-2,0.3-3.7,0.2-5.1-0.2c-1.4-0.4-2.4-1.2-3.1-2.3C6.8,35.2,6.7,34,7,32.5z M41.8,31.3c-0.9-1.5-2.5-3.2-4.7-5
+        c-2.2-1.8-5-3.7-8.2-5.6c-3.3-1.9-6.2-3.3-8.9-4.3c-2.7-1-4.9-1.5-6.7-1.5c-1.8,0-3,0.5-3.5,1.5c-0.6,1-0.4,2.2,0.5,3.8
+        c0.9,1.5,2.5,3.2,4.7,5c2.2,1.8,4.9,3.7,8.2,5.5c3.3,1.9,6.3,3.4,9,4.4c2.7,1,4.9,1.5,6.7,1.5c1.8,0,2.9-0.5,3.5-1.5
+        C42.8,34,42.7,32.8,41.8,31.3z M13.3,36.5c1.8,0,4-0.5,6.7-1.5c2.7-1,5.7-2.5,9-4.4c3.3-1.9,6-3.7,8.2-5.5c2.2-1.8,3.7-3.5,4.6-5
+        c0.9-1.5,1.1-2.8,0.5-3.8c-0.6-1-1.8-1.5-3.5-1.5c-1.8,0-4,0.5-6.7,1.5c-2.7,1-5.6,2.4-8.9,4.3c-3.3,1.9-6.1,3.8-8.3,5.6
+        c-2.2,1.8-3.8,3.5-4.7,5C9.3,32.8,9.2,34,9.7,35C10.3,36,11.5,36.5,13.3,36.5z M22.5,45.3c-1.1-1-2-2.5-2.7-4.3
+        c-0.8-1.9-1.3-4.1-1.7-6.8c-0.4-2.6-0.6-5.6-0.6-8.8c0-3.2,0.2-6.2,0.6-8.8c0.4-2.6,1-4.9,1.7-6.7c0.8-1.9,1.7-3.3,2.7-4.3
+        c1.1-1,2.2-1.5,3.5-1.5c1.3,0,2.5,0.5,3.5,1.5c1.1,1,2,2.5,2.7,4.3c0.8,1.9,1.3,4.1,1.7,6.7c0.4,2.6,0.6,5.5,0.6,8.8
+        c0,3.2-0.2,6.2-0.6,8.8c-0.4,2.6-1,4.9-1.7,6.8c-0.8,1.9-1.7,3.3-2.7,4.3c-1.1,1-2.2,1.5-3.5,1.5C24.7,46.9,23.5,46.4,22.5,45.3z
+        M29,41.9c0.9-1.6,1.5-3.7,2-6.6c0.5-2.8,0.7-6.1,0.7-9.9c0-3.8-0.2-7.1-0.7-9.9c-0.5-2.8-1.2-5-2-6.5c-0.9-1.5-1.9-2.3-3-2.3
+        c-1.2,0-2.2,0.8-3,2.3c-0.9,1.5-1.5,3.7-2,6.5c-0.5,2.8-0.7,6.1-0.7,9.9c0,3.8,0.2,7.1,0.7,9.9c0.5,2.8,1.1,5,2,6.6
+        c0.9,1.6,1.9,2.3,3,2.3C27.2,44.3,28.2,43.5,29,41.9z M23.3,28.1c-0.7-0.7-1.1-1.6-1.1-2.7c0-1,0.4-1.9,1.1-2.7
+        c0.7-0.7,1.6-1.1,2.7-1.1c1,0,1.9,0.4,2.7,1.1c0.7,0.7,1.1,1.6,1.1,2.7c0,1.1-0.4,1.9-1.1,2.7c-0.7,0.7-1.6,1.1-2.7,1.1
+        C25,29.2,24.1,28.9,23.3,28.1z"
+      />
+    </g>
+  </svg>
+</template>
+
+<style lang="scss">
+.cls-1 {
+  fill: #d3d3d3;
+}
+</style>
diff --git a/web/src/components/icons/PublisherDestinationLogo.vue b/web/src/components/icons/PublisherDestinationLogo.vue
new file mode 100644
index 000000000..206a2d6ba
--- /dev/null
+++ b/web/src/components/icons/PublisherDestinationLogo.vue
@@ -0,0 +1,31 @@
+<!-- Copyright (C) 2023 by Posit Software, PBC. -->
+
+<template>
+  <svg
+    id="destination"
+    version="1.1"
+    class="cls-1"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    x="0px"
+    y="0px"
+    viewBox="0 0 52 52"
+    enable-background="new 0 0 52 52"
+    xml:space="preserve"
+  >
+    <g>
+      <path
+        d="M9.5,43.3V12.4c0-1.7,0.8-2.7,2.1-3.3c1.5-0.7,2.8-1,5.6-1c6.8,0,11.4,3.4,17.9,3.4c3,0,4.7-0.7,5.7-0.7
+        c1.2,0,2.2,0.8,2.2,2v18.6c0,1.7-0.8,2.8-2.1,3.4c-1.5,0.7-2.7,1-5.6,1c-6.6,0-11.1-3.4-17.9-3.4c-2.4,0-4,0.6-4.5,0.8v10.2
+        c0,0.9-0.8,1.7-1.7,1.7S9.5,44.2,9.5,43.3z M39.5,30.9V14.4c-1.2,0.3-2.7,0.5-4.5,0.5c-6.7,0-11.4-3.4-17.7-3.4
+        c-2.6,0-4,0.7-4.3,1.3v16.6c1-0.4,2.6-0.6,4.5-0.6c7.1,0,11.7,3.4,17.7,3.4C37.8,32.2,39.2,31.5,39.5,30.9z"
+      />
+    </g>
+  </svg>
+</template>
+
+<style lang="scss">
+.cls-1 {
+  fill: #ffffff;
+}
+</style>
diff --git a/web/src/components/icons/PublisherFolderLogo.vue b/web/src/components/icons/PublisherFolderLogo.vue
new file mode 100644
index 000000000..b7311c166
--- /dev/null
+++ b/web/src/components/icons/PublisherFolderLogo.vue
@@ -0,0 +1,31 @@
+<!-- Copyright (C) 2023 by Posit Software, PBC. -->
+
+<template>
+  <svg
+    id="folder"
+    version="1.1"
+    class="cls-1"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    x="0px"
+    y="0px"
+    viewBox="0 0 52 52"
+    enable-background="new 0 0 52 52"
+    xml:space="preserve"
+  >
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M48.3,15.7c0-4-2.2-5.4-5.4-5.4c-3.3,0-17.4,0-19.7,0S20,6.3,15.6,6.3
+      c-4.4,0-5.3,0-7.6,0c-5.2,0-4.7,6.5-4.7,6.5c0,3.3,0,21.1,0,23.9C3.3,40,5,43,9.7,43c5.6,0,28.7,0.1,32.9,0.1c3.7,0,5.7-1.3,5.7-5.4
+      C48.3,31.2,48.3,19.6,48.3,15.7z M40.6,40c-3.7,0-23.9-0.1-28.8-0.1c-4.4,0-5.2-1.4-5.2-4.8c0-2.8-0.1-20.5,0-22.6s0.5-2.8,2.9-2.8
+      c2,0,4.4,0,5.4,0c3.5,0,3.8,3.8,6.9,3.8c0.7,0,16,0,18.9,0s4.2,0.3,4.2,4.1c0,3.3,0,13,0,18.5C44.9,39.8,43.8,40,40.6,40z"
+    />
+  </svg>
+</template>
+
+<style lang="scss">
+.cls-1 {
+  fill: #ffffff;
+}
+</style>
diff --git a/web/src/components/icons/PublisherPythonLogo.vue b/web/src/components/icons/PublisherPythonLogo.vue
new file mode 100644
index 000000000..a9ba48e1b
--- /dev/null
+++ b/web/src/components/icons/PublisherPythonLogo.vue
@@ -0,0 +1,45 @@
+<!-- Copyright (C) 2023 by Posit Software, PBC. -->
+
+<template>
+  <svg
+    id="python"
+    class="cls-1"
+    version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    x="0px"
+    y="0px"
+    viewBox="0 0 52 52"
+    enable-background="new 0 0 52 52"
+    xml:space="preserve"
+  >
+    <path
+      id="path1948"
+      stroke-width="2.5"
+      stroke-linejoin="round"
+      stroke-miterlimit="10"
+      d="M26.3,6
+      c-1.7,0-3.3,0.2-4.7,0.4c-4.2,0.7-4.9,2.3-4.9,5.1v3.7h9.8v1.2h-9.8H13c-2.9,0-5.3,1.7-6.1,5c-0.9,3.7-0.9,6.1,0,10
+      c0.7,2.9,2.4,5,5.2,5h3.4v-4.5c0-3.2,2.8-6.1,6.1-6.1h9.8c2.7,0,4.9-2.2,4.9-5v-9.3c0-2.7-2.2-4.7-4.9-5.1C29.7,6.1,28,6,26.3,6z
+      M21,9.9c0.6,0,1,0.4,1,1c0,0.6-0.4,1-1,1c-0.6,0-1-0.4-1-1C20,10.3,20.4,9.9,21,9.9z"
+    />
+
+    <path
+      id="path1950"
+      stroke-width="2.5"
+      stroke-linejoin="round"
+      stroke-miterlimit="10"
+      d="M37.5,16.5
+      v4.4c0,3.4-2.9,6.2-6.1,6.2h-9.8c-2.7,0-4.9,2.3-4.9,5v9.3c0,2.7,2.3,4.2,4.9,5c3.1,0.9,6.1,1.1,9.8,0c2.5-0.7,4.9-2.2,4.9-5v-3.7
+      h-9.8v-1.2h9.8h4.9c2.9,0,3.9-2,4.9-5c1-3.1,1-6,0-10c-0.7-2.8-2.1-5-4.9-5L37.5,16.5z M31.2,41c0.6,0,1,0.4,1,1c0,0.6-0.4,1-1,1
+      c-0.6,0-1-0.4-1-1C30.2,41.4,30.6,41,31.2,41z"
+    />
+  </svg>
+</template>
+
+<style lang="scss">
+.cls-1 {
+  fill: #ffffff;
+  stroke: #000000;
+}
+</style>
diff --git a/web/src/components/icons/PublisherSettingsLogo.vue b/web/src/components/icons/PublisherSettingsLogo.vue
new file mode 100644
index 000000000..aac8cecb9
--- /dev/null
+++ b/web/src/components/icons/PublisherSettingsLogo.vue
@@ -0,0 +1,49 @@
+<!-- Copyright (C) 2023 by Posit Software, PBC. -->
+
+<template>
+  <svg
+    id="settings"
+    class="cls-1"
+    version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    x="0px"
+    y="0px"
+    viewBox="0 0 52 52"
+    enable-background="new 0 0 52 52"
+    xml:space="preserve"
+  >
+    <g>
+      <path
+        d="M22.1,45.9c-0.5-0.4-0.9-1-1-1.7l-0.8-3.6l-0.6-0.2l-3.1,1.9c-0.6,0.4-1.3,0.5-2,0.5c-0.7-0.1-1.3-0.4-1.8-0.9L10,39.2
+        c-0.5-0.5-0.8-1.1-0.9-1.8c-0.1-0.7,0.1-1.3,0.5-1.9l1.9-3.1l-0.2-0.6L7.7,31C7,30.8,6.4,30.4,6,29.9c-0.4-0.5-0.6-1.2-0.6-1.9
+        v-3.8c0-0.7,0.2-1.4,0.6-1.9c0.4-0.5,1-0.9,1.7-1.1l3.5-0.9l0.2-0.6l-1.9-3.1C9.1,16,9,15.4,9.1,14.7c0.1-0.7,0.4-1.3,0.9-1.8
+        l2.7-2.7c0.5-0.5,1.1-0.8,1.8-0.9s1.3,0.1,1.9,0.4l3.1,1.9l0.7-0.2L21,7.9c0.2-0.7,0.5-1.3,1-1.7c0.5-0.4,1.2-0.6,1.9-0.6h3.9
+        c0.7,0,1.4,0.2,1.9,0.6c0.5,0.4,0.9,1,1,1.7l0.8,3.6l0.7,0.2l3.1-1.9c0.6-0.4,1.3-0.5,1.9-0.4s1.3,0.4,1.8,0.9l2.7,2.7
+        c0.5,0.5,0.8,1.1,0.9,1.8c0.1,0.7-0.1,1.3-0.5,1.9l-2,3.1l0.2,0.6l3.5,0.9c0.7,0.2,1.3,0.5,1.7,1.1c0.4,0.5,0.6,1.2,0.6,1.9V28
+        c0,0.7-0.2,1.4-0.6,1.9c-0.4,0.5-1,0.9-1.7,1.1l-3.6,0.8l-0.2,0.6l2,3.1c0.4,0.6,0.6,1.3,0.5,1.9c-0.1,0.7-0.4,1.3-0.9,1.8
+        l-2.7,2.7c-0.5,0.5-1.1,0.8-1.8,0.9c-0.7,0.1-1.3-0.1-1.9-0.5l-3.1-1.9l-0.6,0.2l-0.8,3.6c-0.2,0.7-0.5,1.3-1,1.7
+        c-0.5,0.4-1.2,0.6-1.9,0.6H24C23.2,46.6,22.6,46.4,22.1,45.9z M27.5,43.6c0.3,0,0.5-0.1,0.5-0.4l1.2-4.8c0.6-0.1,1.1-0.3,1.7-0.5
+        c0.5-0.2,1-0.5,1.4-0.7l4.2,2.6c0.2,0.2,0.5,0.1,0.7-0.1l2.2-2.3c0.2-0.2,0.2-0.4,0.1-0.7L37,32.5c0.2-0.4,0.5-0.9,0.7-1.4
+        c0.2-0.5,0.4-1.1,0.6-1.7l4.8-1.1c0.3-0.1,0.4-0.2,0.4-0.6v-3.2c0-0.3-0.1-0.5-0.4-0.6l-4.8-1.2c-0.2-0.6-0.4-1.2-0.6-1.7
+        c-0.2-0.5-0.5-1-0.6-1.3l2.6-4.1c0.2-0.3,0.2-0.5-0.1-0.7l-2.3-2.2c-0.2-0.2-0.5-0.2-0.7-0.1L32.3,15c-0.4-0.2-0.9-0.5-1.4-0.7
+        c-0.5-0.2-1.1-0.4-1.7-0.6L28.1,9c0-0.3-0.2-0.4-0.5-0.4h-3.3c-0.3,0-0.5,0.1-0.6,0.4l-1.1,4.8c-0.6,0.2-1.1,0.3-1.7,0.6
+        c-0.6,0.2-1,0.5-1.4,0.7l-4.1-2.5c-0.3-0.1-0.5-0.1-0.7,0.1l-2.3,2.2c-0.2,0.2-0.2,0.5-0.1,0.7l2.6,4.1c-0.2,0.4-0.4,0.8-0.6,1.3
+        c-0.2,0.5-0.5,1.1-0.6,1.7l-4.7,1.2c-0.3,0.1-0.4,0.2-0.4,0.6v3.2c0,0.3,0.1,0.5,0.4,0.6l4.8,1.1c0.2,0.6,0.3,1.1,0.6,1.7
+        c0.2,0.5,0.5,1,0.7,1.4l-2.6,4.1c-0.2,0.3-0.1,0.5,0.1,0.7l2.3,2.3c0.2,0.2,0.5,0.3,0.7,0.1l4.2-2.6c0.4,0.3,0.9,0.5,1.4,0.7
+        c0.5,0.2,1.1,0.4,1.7,0.5l1.2,4.8c0.1,0.3,0.2,0.4,0.6,0.4H27.5z M22.2,32.4c-1.1-0.7-2-1.6-2.7-2.7s-1-2.3-1-3.7
+        c0-1.3,0.3-2.5,1-3.7s1.6-2,2.7-2.6c1.1-0.7,2.3-1,3.7-1c1.3,0,2.6,0.3,3.7,1c1.1,0.7,2,1.5,2.6,2.6c0.7,1.1,1,2.3,1,3.7
+        c0,1.3-0.3,2.6-1,3.7c-0.7,1.1-1.5,2-2.6,2.7c-1.1,0.7-2.3,1-3.7,1C24.6,33.4,23.3,33,22.2,32.4z M28.1,29.8
+        c0.7-0.4,1.2-0.9,1.6-1.6c0.4-0.7,0.6-1.4,0.6-2.2c0-0.8-0.2-1.5-0.6-2.2c-0.4-0.7-0.9-1.2-1.6-1.6c-0.7-0.4-1.4-0.6-2.1-0.6
+        c-0.8,0-1.5,0.2-2.2,0.6s-1.2,0.9-1.6,1.6c-0.4,0.7-0.6,1.4-0.6,2.2c0,0.8,0.2,1.5,0.6,2.2c0.4,0.7,0.9,1.2,1.6,1.6
+        s1.4,0.6,2.2,0.6C26.7,30.4,27.4,30.2,28.1,29.8z"
+      />
+    </g>
+  </svg>
+</template>
+
+<style lang="scss">
+.cls-1 {
+  fill: #ffffff;
+}
+</style>
diff --git a/web/src/components/icons/WhitePositLogo.vue b/web/src/components/icons/WhitePositLogo.vue
index f8ae51e54..f8a8f74a9 100644
--- a/web/src/components/icons/WhitePositLogo.vue
+++ b/web/src/components/icons/WhitePositLogo.vue
@@ -2,66 +2,47 @@
 
 <template>
   <svg
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 705.53 182.52"
-  ><defs /><g id="white-rgb"><path
     id="fullLogo"
-    class="cls-1"
-    d="M228.48,43.34h27.24v5.08c5.08-4.7,14.28-7.15,21.8-7.15,29.69,0,48.11,20.49,48.11,49.43,0,29.69-19.17,51.86-48.86,51.86-9.4,0-18-1.5-21-4.89v41H228.48Zm27.24,34.39v31.19c3,4.51,9.59,8.27,17.29,8.27,15.22,0,24.43-9.58,24.43-24.43,0-17.29-8.64-26.12-22.93-26.12A20.36,20.36,0,0,0,255.72,77.73Z"
-  /><path
-    id="fullLogo-2"
-    data-name="fullLogo"
-    class="cls-1"
-    d="M387.58,41.27c31.19,0,53.17,21.24,53.17,50.74,0,29.31-22,50.55-53.17,50.55-30.26,0-52.81-21.24-52.81-50.55C334.77,62.51,356.38,41.27,387.58,41.27Zm0,75.92c14.84,0,25-9.39,25-25.18,0-16.16-11.28-25.37-25-25.37S363,75.85,363,92C363,106.29,372.92,117.19,387.58,117.19Z"
-  /><path
-    id="fullLogo-3"
-    data-name="fullLogo"
-    class="cls-1"
-    d="M451.1,71.53c0-18.79,15.6-30.26,42.09-30.26,18.61,0,34.39,8.65,40.59,17.67l-18.6,17.85c-6.39-6.58-15.22-10.15-27.44-10.15-5.07,0-8.45,1.13-8.45,4.7,0,8.46,55.43,5.83,55.43,40.4,0,21.42-19.17,30.82-41.34,30.82-23.86,0-39.84-10.9-46.79-23.68l21.61-14.65c5.26,6.76,16.16,13,28.19,13,6.57,0,10.14-1.69,10.14-5.26C506.53,102.35,451.1,104.79,451.1,71.53Z"
-  /><path
-    id="fullLogo-4"
-    data-name="fullLogo"
-    class="cls-1"
-    d="M562.79,3.88c8.83,0,15.22,5.83,15.22,13.53,0,8.08-6.39,13.91-15.22,13.91-9.58,0-15.41-5.83-15.41-13.91C547.38,9.71,553.77,3.88,562.79,3.88ZM549.07,43.34h27.25v97.72H549.07Z"
-  /><path
-    id="fullLogo-5"
-    data-name="fullLogo"
-    class="cls-1"
-    d="M586.74,43.34h18.61V20.6h27.24V43.34h29.88V68.71H632.59v31.76c0,11.84,2.64,16.35,10,16.35,6.39,0,11.47-2.26,16.73-6.39l11.27,19.35c-6.76,7.14-17.29,12.4-30.63,12.4-20.48,0-34.57-11.08-34.57-33.63V68.71H586.74Z"
-  /><path
-    id="fullLogo-6"
-    data-name="fullLogo"
-    class="cls-1"
-    d="M676,43.47h11.66v2.8h-4.35V57h-3V46.27H676Z"
-  /><path
-    id="fullLogo-7"
-    data-name="fullLogo"
-    class="cls-1"
-    d="M689.17,43.47H692l4.33,6.47,4.11-6.47h2.7V57h-3v-8.1l-3.51,5.38h-.8l-3.62-5.44V57h-3Z"
-  /><polygon
-    id="fullLogo-8"
-    data-name="fullLogo"
-    class="cls-1"
-    points="38.33 73.11 46.45 69.52 83.2 53.28 91.23 49.74 180.02 10.51 180.02 57.83 144.12 73.11 136 69.52 173.53 53.54 173.53 20.47 99.25 53.28 91.23 56.83 54.63 73 46.5 76.59 20.6 88.03 20.6 96.52 46.1 107.79 54.23 111.38 91.8 127.97 99.76 131.49 173.53 164.08 173.53 130.66 136.39 114.86 144.52 111.27 180.02 126.38 180.02 174.04 91.82 135.07 83.85 131.55 46.06 114.86 37.93 111.27 14.12 100.74 14.12 83.81 38.33 73.11"
-  /><polygon
-    class="cls-1"
-    points="99.5 92.1 135.94 76.59 127.82 73 82.94 92.1 128.22 111.38 136.34 107.79 99.5 92.1"
-  /><polygon
-    id="fullLogo-9"
-    data-name="fullLogo"
-    class="cls-1"
-    points="46.1 107.79 54.23 111.38 91.23 95.63 82.95 92.1 46.1 107.79"
-  /><polygon
-    id="fullLogo-10"
-    data-name="fullLogo"
-    class="cls-1"
-    points="54.63 73 46.5 76.59 82.95 92.1 91.23 88.58 54.63 73"
-  /><polygon
-    id="fullLogo-11"
-    data-name="fullLogo"
-    class="cls-1"
-    points="144.12 73.11 136 69.52 99.25 53.28 91.23 49.74 2.44 10.51 2.44 57.83 38.33 73.11 46.45 69.52 8.92 53.54 8.92 20.47 83.2 53.28 91.23 56.83 127.83 73 135.95 76.59 161.85 88.03 161.85 96.52 136.35 107.79 128.22 111.38 90.66 127.97 82.69 131.49 8.92 164.08 8.92 130.66 46.06 114.86 37.93 111.27 2.44 126.38 2.44 174.04 90.63 135.07 98.6 131.55 136.39 114.86 144.52 111.27 168.34 100.74 168.34 83.81 144.12 73.11"
-  /></g></svg>
+    xmlns="http://www.w3.org/2000/svg"
+    version="1.1"
+    class="cls-1"
+    x="0px"
+    y="0px"
+    viewBox="0 0 104 45"
+    enable-background="new 0 0 104 52"
+    xml:space="preserve"
+  >
+    <g>
+      <path
+        d="M3.6,15.2h5.2v1c1-0.9,2.7-1.4,4.2-1.4c5.7,0,9.2,3.9,9.2,9.5c0,5.7-3.7,9.9-9.4,9.9c-1.8,0-3.5-0.3-4-0.9v7.8H3.6V15.2z
+        M8.9,21.8v6c0.6,0.9,1.8,1.6,3.3,1.6c2.9,0,4.7-1.8,4.7-4.7c0-3.3-1.7-5-4.4-5C10.7,19.7,9.5,20.6,8.9,21.8z"
+      />
+      <path
+        d="M33.8,14.8c6,0,10.2,4.1,10.2,9.7c0,5.6-4.2,9.7-10.2,9.7c-5.8,0-10.1-4.1-10.1-9.7C23.7,18.9,27.8,14.8,33.8,14.8z
+        M33.8,29.4c2.8,0,4.8-1.8,4.8-4.8c0-3.1-2.2-4.9-4.8-4.9c-2.6,0-4.7,1.8-4.7,4.9C29.1,27.3,31,29.4,33.8,29.4z"
+      />
+      <path
+        d="M46,20.6c0-3.6,3-5.8,8.1-5.8c3.6,0,6.6,1.7,7.8,3.4l-3.6,3.4c-1.2-1.3-2.9-1.9-5.3-1.9c-1,0-1.6,0.2-1.6,0.9
+        c0,1.6,10.6,1.1,10.6,7.7c0,4.1-3.7,5.9-7.9,5.9c-4.6,0-7.6-2.1-9-4.5l4.1-2.8c1,1.3,3.1,2.5,5.4,2.5c1.3,0,1.9-0.3,1.9-1
+        C56.6,26.5,46,27,46,20.6z"
+      />
+      <path
+        d="M67.1,7.7c1.7,0,2.9,1.1,2.9,2.6c0,1.5-1.2,2.7-2.9,2.7c-1.8,0-3-1.1-3-2.7C64.2,8.8,65.4,7.7,67.1,7.7z M64.5,15.2h5.2
+        v18.7h-5.2V15.2z"
+      />
+      <path
+        d="M71.9,15.2h3.6v-4.4h5.2v4.4h5.7v4.9h-5.7v6.1c0,2.3,0.5,3.1,1.9,3.1c1.2,0,2.2-0.4,3.2-1.2l2.2,3.7
+        c-1.3,1.4-3.3,2.4-5.9,2.4c-3.9,0-6.6-2.1-6.6-6.4v-7.6h-3.6V15.2z"
+      />
+    </g>
+    <g>
+      <path d="M91.9,17.7h-1.1v-6.2h-1.7v-1h4.6v1h-1.7V17.7z" />
+      <path
+        d="M97.4,17.7l-1.8-5.8h0c0,0.2,0,0.4,0,0.6s0,0.4,0,0.6c0,0.2,0,0.4,0,0.6v4.1h-1v-7.1h1.6l1.7,5.6h0l1.8-5.6h1.6v7.1h-1.1
+        v-4.1c0-0.2,0-0.4,0-0.6c0-0.2,0-0.4,0-0.6s0-0.4,0-0.6h0l-1.9,5.8H97.4z"
+      />
+    </g>
+  </svg>
 </template>
 
 <style lang="scss">

From f3380c6e38ae75ce7835058a7f793b2749dcdb61 Mon Sep 17 00:00:00 2001
From: Bill Sager <whs@sager.org>
Date: Tue, 19 Sep 2023 16:13:43 -0700
Subject: [PATCH 24/33] PR comments/requests

---
 web/src/components/configurePublish/DeploymentMode.vue   | 2 +-
 web/src/components/configurePublish/LayoutPanel.vue      | 8 ++++----
 web/src/components/configurePublish/PublishingHeader.vue | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/src/components/configurePublish/DeploymentMode.vue b/web/src/components/configurePublish/DeploymentMode.vue
index 8774ec643..74de532c1 100644
--- a/web/src/components/configurePublish/DeploymentMode.vue
+++ b/web/src/components/configurePublish/DeploymentMode.vue
@@ -27,7 +27,7 @@ import { PropType } from 'vue';
 import { useModelWrapper } from 'src/utils/modelWrapper.ts';
 import type { DeploymentModeType } from 'src/api/types/deployments.ts';
 
-const emit = defineEmits([<string>'update:modelValue']);
+const emit = defineEmits(['update:modelValue']);
 
 const props = defineProps({
   modelValue: {
diff --git a/web/src/components/configurePublish/LayoutPanel.vue b/web/src/components/configurePublish/LayoutPanel.vue
index d15596a14..4c72ab2ab 100644
--- a/web/src/components/configurePublish/LayoutPanel.vue
+++ b/web/src/components/configurePublish/LayoutPanel.vue
@@ -45,10 +45,10 @@
 
 const props = defineProps({
   title: { type: String, required: true },
-  subtitle: { type: String, required: false, default: null },
-  tooltip: { type: String, required: false, default: null },
+  subtitle: { type: String, required: false, default: undefined },
+  tooltip: { type: String, required: false, default: undefined },
   defaultOpen: { type: Boolean, required: false, default: false },
-  expandIcon: { type: String, required: false, default: null },
-  group: { type: String, required: false, default: null },
+  expandIcon: { type: String, required: false, default: undefined },
+  group: { type: String, required: false, default: undefined },
 });
 </script>
diff --git a/web/src/components/configurePublish/PublishingHeader.vue b/web/src/components/configurePublish/PublishingHeader.vue
index c8144fc52..e4ebd18e0 100644
--- a/web/src/components/configurePublish/PublishingHeader.vue
+++ b/web/src/components/configurePublish/PublishingHeader.vue
@@ -13,7 +13,7 @@
       dark
       clearable
       hint="Enter a title for your content on the server"
-      style="min-width: 75%"
+      class="col-9"
     />
     <q-btn
       color="primary"
@@ -30,7 +30,7 @@
 import { ref } from 'vue';
 import { useApi } from 'src/api';
 
-const emit = defineEmits([<string>'publish']);
+const emit = defineEmits(['publish']);
 
 const api = useApi();
 const title = ref('');

From 06e6e5f0f3f80cd425afeee4088af694c87ef367 Mon Sep 17 00:00:00 2001
From: Bill Sager <whs@sager.org>
Date: Wed, 20 Sep 2023 08:46:54 -0700
Subject: [PATCH 25/33] removed  use of modelWrapper

---
 .../configurePublish/DeploymentMode.vue       | 22 +++++++++++-------
 web/src/utils/modelWrapper.ts                 | 23 -------------------
 2 files changed, 14 insertions(+), 31 deletions(-)
 delete mode 100644 web/src/utils/modelWrapper.ts

diff --git a/web/src/components/configurePublish/DeploymentMode.vue b/web/src/components/configurePublish/DeploymentMode.vue
index 74de532c1..3e8411589 100644
--- a/web/src/components/configurePublish/DeploymentMode.vue
+++ b/web/src/components/configurePublish/DeploymentMode.vue
@@ -4,7 +4,7 @@
   <div class="row justify-center">
     <div style="width: 60%">
       <q-btn-toggle
-        v-model="deployMode"
+        v-model="value"
         no-caps
         unelevated
         dark
@@ -22,10 +22,9 @@
 </template>
 
 <script setup lang="ts">
-import { PropType } from 'vue';
+import { PropType, computed } from 'vue';
 
-import { useModelWrapper } from 'src/utils/modelWrapper.ts';
-import type { DeploymentModeType } from 'src/api/types/deployments.ts';
+import { DeploymentModeType } from 'src/api/types/deployments.ts';
 
 const emit = defineEmits(['update:modelValue']);
 
@@ -36,11 +35,18 @@ const props = defineProps({
   },
 });
 
-const deployMode = useModelWrapper(props, emit);
-
 const options = [
-  { label: 'New Deployment', value: 'new' },
-  { label: 'Existing Deployment', value: 'update' }
+  { label: 'New Deployment', value: <DeploymentModeType>'new' },
+  { label: 'Existing Deployment', value: <DeploymentModeType>'update' }
 ];
 
+const value = computed({
+  get() {
+    return props.modelValue;
+  },
+  set(newValue) {
+    emit('update:modelValue', newValue);
+  }
+});
+
 </script>
diff --git a/web/src/utils/modelWrapper.ts b/web/src/utils/modelWrapper.ts
deleted file mode 100644
index 00af7aea5..000000000
--- a/web/src/utils/modelWrapper.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (C) 2023 by Posit Software, PBC.
-
-import { computed } from 'vue';
-
-// Implemented from: V-Model in Vue3
-// https://vanoneang.github.io/article/v-model-in-vue3.html#turn-it-into-a-composable
-//
-// This technique provides us a way of creating a component which supports multiple
-// v-models in its props, but doesn't need to keep implementing the emits, nor the
-// typical watches.
-//
-// See DeploymentMode.vue for example of usage.
-
-export function useModelWrapper(
-  props: { modelValue: unknown; },
-  emit: (arg0: string, arg1: unknown) => void,
-  updateName = 'modelValue',
-) {
-  return computed({
-    get: () => props.modelValue,
-    set: (value) => emit(`update:${updateName}`, value)
-  });
-}

From 2cb8c31bf4c45e9a5bb8e3f2ebd5c84d5afec998 Mon Sep 17 00:00:00 2001
From: Bill Sager <whs@sager.org>
Date: Wed, 20 Sep 2023 11:45:27 -0700
Subject: [PATCH 26/33] Futher PR updates

---
 web/src/App.vue                                  |  4 ++--
 web/src/components/AppMenu.vue                   |  9 ---------
 .../configurePublish/ConfigurePublish.vue        |  2 +-
 .../components/configurePublish/LayoutPanel.vue  | 16 ++++++++--------
 .../configurePublish/PublishingHeader.vue        |  3 +--
 .../components/publishProcess/PublishProcess.vue |  2 +-
 6 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/web/src/App.vue b/web/src/App.vue
index 16ec6893c..3e2e82ab5 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -9,7 +9,7 @@
       elevated
       class="bg-primary text-white"
     >
-      <q-toolbar class="max-width-md q-pa-none">
+      <q-toolbar class="max-width-md q-pa-auto">
         <AppMenu />
         <WhitePositLogo
           class="posit-logo"
@@ -48,7 +48,7 @@ import { useDeploymentStore } from 'src/stores/deployment';
 
 type viewType = 'configure' | 'publish';
 
-const currentView = ref(<viewType>'configure');
+const currentView = ref<viewType>('configure');
 const api = useApi();
 const deploymentStore = useDeploymentStore();
 
diff --git a/web/src/components/AppMenu.vue b/web/src/components/AppMenu.vue
index 0f50c30c9..f24061e0e 100644
--- a/web/src/components/AppMenu.vue
+++ b/web/src/components/AppMenu.vue
@@ -5,9 +5,7 @@
     <q-btn
       flat
       icon="menu"
-
       class="q-px-xs"
-      @click="menu = !menu"
     >
       <q-menu
         dark
@@ -64,10 +62,3 @@
     </q-btn>
   </div>
 </template>
-
-<script setup lang="ts">
-import { ref } from 'vue';
-
-const menu = ref(false);
-
-</script>
diff --git a/web/src/components/configurePublish/ConfigurePublish.vue b/web/src/components/configurePublish/ConfigurePublish.vue
index 92d743d2b..365dad945 100644
--- a/web/src/components/configurePublish/ConfigurePublish.vue
+++ b/web/src/components/configurePublish/ConfigurePublish.vue
@@ -42,7 +42,7 @@ import AdvancedSettings from 'src/components/configurePublish/AdvancedSettings.v
 
 import type { DeploymentModeType } from 'src/api/types/deployments.ts';
 
-const emit = defineEmits([<string>'publish']);
+const emit = defineEmits(['publish']);
 
 const deploymentMode = ref<DeploymentModeType>('new');
 
diff --git a/web/src/components/configurePublish/LayoutPanel.vue b/web/src/components/configurePublish/LayoutPanel.vue
index 4c72ab2ab..0bdbcfdd6 100644
--- a/web/src/components/configurePublish/LayoutPanel.vue
+++ b/web/src/components/configurePublish/LayoutPanel.vue
@@ -4,8 +4,8 @@
   <q-expansion-item
     :default-opened="defaultOpen"
     :expand-icon="expandIcon"
-    header-style="padding: unset;"
-    :group="props.group"
+    header-class="q-px-none"
+    :group="group"
   >
     <template #header>
       <q-item-section
@@ -16,18 +16,18 @@
       </q-item-section>
 
       <q-item-section>
-        <q-item-label>{{ props.title }}</q-item-label>
+        <q-item-label>{{ title }}</q-item-label>
         <q-item-label
-          v-if="props.subtitle"
+          v-if="subtitle"
           caption
         >
-          {{ props.subtitle }}
+          {{ subtitle }}
         </q-item-label>
         <q-tooltip
-          v-if="props.tooltip"
+          v-if="tooltip"
           anchor="top middle"
         >
-          {{ props.tooltip }}
+          {{ tooltip }}
         </q-tooltip>
       </q-item-section>
     </template>
@@ -43,7 +43,7 @@
 
 <script setup lang="ts">
 
-const props = defineProps({
+defineProps({
   title: { type: String, required: true },
   subtitle: { type: String, required: false, default: undefined },
   tooltip: { type: String, required: false, default: undefined },
diff --git a/web/src/components/configurePublish/PublishingHeader.vue b/web/src/components/configurePublish/PublishingHeader.vue
index e4ebd18e0..bd1af0701 100644
--- a/web/src/components/configurePublish/PublishingHeader.vue
+++ b/web/src/components/configurePublish/PublishingHeader.vue
@@ -2,8 +2,7 @@
 
 <template>
   <div
-    class="q-my-lg row justify-between"
-    style="align-items: flex-start;"
+    class="q-my-lg row justify-between items-start"
   >
     <q-input
       v-model="title"
diff --git a/web/src/components/publishProcess/PublishProcess.vue b/web/src/components/publishProcess/PublishProcess.vue
index 1dd611c1f..f221b4d35 100644
--- a/web/src/components/publishProcess/PublishProcess.vue
+++ b/web/src/components/publishProcess/PublishProcess.vue
@@ -19,7 +19,7 @@
 
 <script setup lang="ts">
 
-const emit = defineEmits([<string>'back']);
+const emit = defineEmits(['back']);
 
 const onBackButton = () => {
   emit('back');

From 2c122283cecf0a8f481430f0fdd9a537cda4c40c Mon Sep 17 00:00:00 2001
From: Michael Marchetti <mike@rstudio.com>
Date: Thu, 21 Sep 2023 11:17:54 -0400
Subject: [PATCH 27/33] rename API file

---
 internal/services/api/{publish.go => post_publish.go}           | 0
 internal/services/api/{publish_test.go => post_publish_test.go} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename internal/services/api/{publish.go => post_publish.go} (100%)
 rename internal/services/api/{publish_test.go => post_publish_test.go} (100%)

diff --git a/internal/services/api/publish.go b/internal/services/api/post_publish.go
similarity index 100%
rename from internal/services/api/publish.go
rename to internal/services/api/post_publish.go
diff --git a/internal/services/api/publish_test.go b/internal/services/api/post_publish_test.go
similarity index 100%
rename from internal/services/api/publish_test.go
rename to internal/services/api/post_publish_test.go

From 78f1f67afd0af44c04a98bfcba5deceff7f76301 Mon Sep 17 00:00:00 2001
From: Bill Sager <whs@sager.org>
Date: Thu, 21 Sep 2023 15:27:05 -0700
Subject: [PATCH 28/33] Initial implementation.

---
 cmd/connect-client/commands/publish.go        |   9 +-
 internal/events/sse_logger.go                 |   4 +-
 internal/events/sse_logger_test.go            |   4 +-
 internal/services/ui/ui_service.go            |  11 +-
 web/src/App.vue                               |  24 +-
 web/src/api/resources/EventStream.ts          | 278 ++++++++++++++++++
 web/src/api/types/events.ts                   |  89 ++++++
 .../publishProcess/PublishProcess.vue         |  53 ++++
 8 files changed, 462 insertions(+), 10 deletions(-)
 create mode 100644 web/src/api/resources/EventStream.ts
 create mode 100644 web/src/api/types/events.ts

diff --git a/cmd/connect-client/commands/publish.go b/cmd/connect-client/commands/publish.go
index bc9bfdde2..8b015e105 100644
--- a/cmd/connect-client/commands/publish.go
+++ b/cmd/connect-client/commands/publish.go
@@ -7,6 +7,7 @@ import (
 	"io/fs"
 	"os"
 
+	"github.com/r3labs/sse/v2"
 	"github.com/rstudio/connect-client/internal/apptypes"
 	"github.com/rstudio/connect-client/internal/bundles"
 	"github.com/rstudio/connect-client/internal/bundles/gitignore"
@@ -252,7 +253,10 @@ func (cmd *PublishUICmd) Run(args *cli_types.CommonArgs, ctx *cli_types.CLIConte
 	if err != nil {
 		return err
 	}
-	log := events.NewLoggerWithSSE(args.Debug)
+	eventServer := sse.New()
+	eventServer.CreateStream("messages")
+
+	log := events.NewLoggerWithSSE(args.Debug, eventServer)
 	svc := ui.NewUIService(
 		"/",
 		cmd.UIArgs,
@@ -260,6 +264,7 @@ func (cmd *PublishUICmd) Run(args *cli_types.CommonArgs, ctx *cli_types.CLIConte
 		ctx.LocalToken,
 		ctx.Fs,
 		ctx.Accounts,
-		log)
+		log,
+		eventServer)
 	return svc.Run()
 }
diff --git a/internal/events/sse_logger.go b/internal/events/sse_logger.go
index d33e0c792..9df13c24b 100644
--- a/internal/events/sse_logger.go
+++ b/internal/events/sse_logger.go
@@ -24,10 +24,8 @@ func NewLogger(debug bool) logging.Logger {
 	return logging.FromStdLogger(slog.New(stderrHandler))
 }
 
-func NewLoggerWithSSE(debug bool) logging.Logger {
+func NewLoggerWithSSE(debug bool, eventServer *sse.Server) logging.Logger {
 	level := logLevel(debug)
-	eventServer := sse.New()
-	eventServer.CreateStream("messages")
 	stderrHandler := slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: level})
 	sseHandler := NewSSEHandler(eventServer, &SSEHandlerOptions{Level: level})
 	multiHandler := logging.NewMultiHandler(stderrHandler, sseHandler)
diff --git a/internal/events/sse_logger_test.go b/internal/events/sse_logger_test.go
index 204ffb265..9b9356241 100644
--- a/internal/events/sse_logger_test.go
+++ b/internal/events/sse_logger_test.go
@@ -7,6 +7,7 @@ import (
 	"log/slog"
 	"testing"
 
+	"github.com/r3labs/sse/v2"
 	"github.com/rstudio/connect-client/internal/logging"
 	"github.com/rstudio/connect-client/internal/util/utiltest"
 	"github.com/stretchr/testify/suite"
@@ -35,6 +36,7 @@ func (s *LoggerSuite) TestNewLoggerDebug() {
 }
 
 func (s *LoggerSuite) TestNewLoggerWithSSE() {
-	log := NewLoggerWithSSE(false)
+	sseServer := sse.New()
+	log := NewLoggerWithSSE(false, sseServer)
 	s.IsType(log.Handler(), &logging.MultiHandler{})
 }
diff --git a/internal/services/ui/ui_service.go b/internal/services/ui/ui_service.go
index 1784e35d5..55f636fdf 100644
--- a/internal/services/ui/ui_service.go
+++ b/internal/services/ui/ui_service.go
@@ -18,6 +18,7 @@ import (
 	"github.com/rstudio/connect-client/web"
 
 	"github.com/gorilla/mux"
+	"github.com/r3labs/sse/v2"
 	"github.com/spf13/afero"
 )
 
@@ -30,9 +31,10 @@ func NewUIService(
 	token services.LocalToken,
 	fs afero.Fs,
 	lister accounts.AccountList,
-	log logging.Logger) *api.Service {
+	log logging.Logger,
+	eventServer *sse.Server) *api.Service {
 
-	handler := RouterHandlerFunc(fs, publish, lister, log)
+	handler := RouterHandlerFunc(fs, publish, lister, log, eventServer)
 
 	return api.NewService(
 		publish.State,
@@ -50,7 +52,7 @@ func NewUIService(
 	)
 }
 
-func RouterHandlerFunc(afs afero.Fs, publishArgs *cli_types.PublishArgs, lister accounts.AccountList, log logging.Logger) http.HandlerFunc {
+func RouterHandlerFunc(afs afero.Fs, publishArgs *cli_types.PublishArgs, lister accounts.AccountList, log logging.Logger, eventServer *sse.Server) http.HandlerFunc {
 	deployment := publishArgs.State
 	base := deployment.SourceDir
 
@@ -63,6 +65,9 @@ func RouterHandlerFunc(afs afero.Fs, publishArgs *cli_types.PublishArgs, lister
 	r.Handle(ToPath("accounts"), api.GetAccountsHandlerFunc(lister, log)).
 		Methods(http.MethodGet)
 
+	// GET /api/events
+	r.HandleFunc(ToPath("events"), eventServer.ServeHTTP)
+
 	// GET /api/files
 	r.Handle(ToPath("files"), api.GetFileHandlerFunc(base, filesService, pathsService, log)).
 		Methods(http.MethodGet)
diff --git a/web/src/App.vue b/web/src/App.vue
index 3e2e82ab5..654d05888 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -28,6 +28,8 @@
       />
       <PublishProcess
         v-if="currentView === 'publish'"
+        :events="allEvents"
+        :event-stream="eventStream"
         @back="onConfigure"
       />
     </q-page-container>
@@ -36,7 +38,7 @@
 
 <script setup lang="ts">
 
-import { ref } from 'vue';
+import { onBeforeUnmount, ref } from 'vue';
 
 import AppMenu from 'src/components/AppMenu.vue';
 import ConfigurePublish from 'src/components/configurePublish/ConfigurePublish.vue';
@@ -45,6 +47,8 @@ import WhitePositLogo from 'src/components/icons/WhitePositLogo.vue';
 
 import { useApi } from 'src/api';
 import { useDeploymentStore } from 'src/stores/deployment';
+import { EventStream } from 'src/api/resources/EventStream';
+import { EventStreamMessage } from 'src/api/types/events';
 
 type viewType = 'configure' | 'publish';
 
@@ -52,6 +56,10 @@ const currentView = ref<viewType>('configure');
 const api = useApi();
 const deploymentStore = useDeploymentStore();
 
+const eventStream = new EventStream();
+// Temporary storage of events
+const allEvents = ref<EventStreamMessage[]>([]);
+
 const onPublish = () => {
   currentView.value = 'publish';
 };
@@ -64,6 +72,20 @@ const getInitialDeploymentState = async() => {
   deploymentStore.deployment = deployment;
 };
 
+const incomingEvent = (msg: EventStreamMessage) => {
+  allEvents.value.push(msg);
+};
+eventStream.addEventMonitorCallback(['*'], incomingEvent);
+
+eventStream.setDebugMode(true);
+eventStream.open('/api/events?stream=messages');
+console.log(eventStream.status());
+
+// Have to be sure to close connection or it will be leaked on agent (if it continues to run)
+onBeforeUnmount(() => {
+  eventStream.close();
+});
+
 getInitialDeploymentState();
 </script>
 
diff --git a/web/src/api/resources/EventStream.ts b/web/src/api/resources/EventStream.ts
new file mode 100644
index 000000000..66d77e336
--- /dev/null
+++ b/web/src/api/resources/EventStream.ts
@@ -0,0 +1,278 @@
+// Copyright (C) 2023 by Posit Software, PBC.
+
+import camelcaseKeys from 'camelcase-keys';
+
+import {
+  OnMessageEventSourceCallback,
+  MethodResult,
+  EventStatus,
+  MockMessage,
+  EventStreamMessage,
+  isEventStreamMessage,
+  EventSubscriptionTargets,
+} from 'src/api/types/events.ts';
+
+export type OurMessageEvent = {
+  data: string,
+}
+
+export type CallbackQueueEntry = {
+  eventType: EventSubscriptionTargets,
+  callback: OnMessageEventSourceCallback,
+}
+
+export class EventStream {
+  private mockMessages = <MockMessage[] | null>null;
+  private mockingActive = false;
+  private eventSource = <EventSource | null>null;
+  private isOpen = false;
+  private lastError = <string | null>null;
+  private debugEnabled = false;
+
+  private subscriptions = <CallbackQueueEntry[]>[];
+
+  private logMsg(msg: string) {
+    if (this.debugEnabled) {
+      console.debug(`DEBUG: ${msg}`);
+    }
+  }
+
+  private logError(msg: string, error: MethodResult): MethodResult {
+    this.logMsg(`${msg}: error = ${error?.error}`);
+    return error;
+  }
+
+  private matchEvent(
+    subscriptionType: EventSubscriptionTargets,
+    incomingEventType: EventSubscriptionTargets
+  ) {
+    this.logMsg(`MatchEvent: subscription type: ${subscriptionType}, incomingType: ${incomingEventType}`);
+    if (subscriptionType.indexOf('*') === 0) {
+      this.logMsg('matched on *');
+      return true;
+    }
+    const wildCardIndex = subscriptionType.indexOf('/*');
+    if (wildCardIndex > 0 && subscriptionType.length === wildCardIndex + 2) {
+      const basePath = subscriptionType.substring(0, wildCardIndex);
+      if (incomingEventType.indexOf(basePath) === 0) {
+        this.logMsg('matched on start of string');
+        return true;
+      }
+    }
+    const globIndex = subscriptionType.indexOf('/**/');
+    if (globIndex > 0) {
+      const parts = subscriptionType.split('/**/');
+      if (
+        incomingEventType.indexOf(parts[0]) === 0 &&
+        incomingEventType.indexOf(parts[1]) === incomingEventType.length - parts[1].length
+      ) {
+        this.logMsg('matched on glob');
+        return true;
+      }
+    }
+
+    // no wild-card. Must match exactly
+    this.logMsg(`attempt to match on exact string. Result = ${subscriptionType === incomingEventType}`);
+    return subscriptionType === incomingEventType;
+  }
+
+  private dispatchMessage(msg: EventStreamMessage) {
+    let numMatched = 0;
+    this.subscriptions.forEach(entry => {
+      if (this.matchEvent(entry.eventType, msg.type)) {
+        numMatched++;
+        entry.callback(msg);
+      }
+    });
+    if (numMatched === 0 && msg.type !== 'errors/open') {
+      this.logMsg(`WARNING! No subscriber/handler found for msg: ${JSON.stringify}`);
+      this.dispatchMessage({
+        type: 'errors/unknownEvent',
+        time: new Date().toString(),
+        data: {
+          event: msg,
+        },
+      });
+    }
+  }
+
+  private onRawOpenCallback() {
+    this.logMsg(`received RawOpenCallback`);
+    this.isOpen = true;
+    this.dispatchMessage({
+      type: 'open/sse',
+      time: new Date().toString(),
+      data: {},
+    });
+  }
+
+  private onErrorRawCallback(e: Event) {
+    // errors are fatal, connection is down.
+    // not receiving anything of value from calling parameters. only : {"isTrusted":true}
+    this.logMsg(`received ErrorRawCallback: ${JSON.stringify(e)}`);
+    this.isOpen = false;
+    this.lastError = `unknown error with connection ${Date.now()}`;
+    const now = new Date();
+    this.dispatchMessage({
+      type: 'errors/open',
+      time: now.toString(),
+      data: `{ msg: ${this.lastError} }`,
+    });
+  }
+
+  private parseMessageData(data: string) : EventStreamMessage | null {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const rawObj: any = JSON.parse(data);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const obj: any = camelcaseKeys(rawObj);
+    // Type safety guard!
+    if (isEventStreamMessage(obj)) {
+      return obj as EventStreamMessage;
+    }
+    return null;
+  }
+
+  private onMessageRawCallback(msg: MessageEvent) {
+    this.logMsg(`received MessageRawCallback (for real): ${msg.data}`);
+    const parsed = this.parseMessageData(msg.data);
+    if (!parsed) {
+      const errorMsg = `Invalid EventStreamMessage received: ${msg.data}`;
+      const now = new Date();
+      this.dispatchMessage({
+        type: 'errors/open',
+        time: now.toString(),
+        data: `{ msg: "${errorMsg}" }`,
+      });
+      return;
+    }
+    this.logMsg(`Received event type = ${parsed.type}`);
+    this.dispatchMessage(parsed);
+  }
+
+  private initializeConnection(url: string, withCredentials: boolean): MethodResult {
+    if (!this.mockingActive) {
+      this.logMsg(`initializing non-mocking connection to ${url}, with credentials: ${withCredentials}`);
+      this.eventSource = new EventSource(url, { withCredentials: withCredentials });
+      this.eventSource.onopen = () => this.onRawOpenCallback();
+      // nothing good seems to come with the error data. Only get {"isTrusted":true}
+      this.eventSource.onerror = (e) => this.onErrorRawCallback(e);
+      this.eventSource.onmessage = (msg: MessageEvent) => this.onMessageRawCallback(msg);
+    } else if (this.mockMessages) {
+      this.logMsg(`initializing mocked connection to ${url}, with credentials: ${withCredentials}, loading ${this.mockMessages.length} messages`);
+      this.mockMessages.forEach(msg => {
+        this.onMessageRawCallback(new MessageEvent('message', { data: msg.data }));
+      });
+    }
+    return {
+      ok: true,
+    };
+  }
+
+  public open(url: string, withCredentials = false): MethodResult {
+    this.logMsg(`opening connection ${url}, with credentials: ${withCredentials}}`);
+    if (this.isOpen) {
+      return this.logError(
+        `failure opening connection`,
+        {
+          ok: false,
+          error: `EventStream instance has already been initialized to ${url}.`,
+        }
+      );
+    }
+    if (!url) {
+      return this.logError(
+        `failure opening connection`,
+        {
+          ok: false,
+          error: `URL parameter must be a non-empty string.`,
+        }
+      );
+    }
+    return this.initializeConnection(url, withCredentials);
+  }
+
+  public close(): MethodResult {
+    if (this.isOpen && !this.mockingActive && this.eventSource !== null) {
+      this.eventSource.close();
+      this.eventSource = null;
+      this.isOpen = false;
+      return {
+        ok: true,
+      };
+    }
+    return this.logError(
+      `failure closing connection`,
+      {
+        ok: false,
+        error: `EventSource is not open.`,
+      }
+    );
+  }
+
+  public addEventMonitorCallback(
+    targets: EventSubscriptionTargets[],
+    cb: OnMessageEventSourceCallback
+  ) {
+    for (const t in targets) {
+      this.subscriptions.push({
+        eventType: targets[t],
+        callback: cb,
+      });
+    }
+  }
+
+  public delEventFilterCallback(cb: OnMessageEventSourceCallback) {
+    let found = false;
+    let index = -1;
+    // We may have multiple events being delivered to same callback
+    // so we have to search until we do not find anything
+    do {
+      index = this.subscriptions.findIndex(entry => entry.callback === cb);
+      if (index >= 0) {
+        this.subscriptions.splice(index, 1);
+        found = true;
+      }
+    } while (index >= 0);
+    if (found) {
+      this.logMsg(`delEventFilterCallback found at least one match!`);
+    } else {
+      this.logMsg(`delEventFilterCallback did NOT match any subcription callbacks!`);
+    }
+    return found;
+  }
+
+  public status(): EventStatus {
+    return {
+      withCredentials: this.eventSource?.withCredentials,
+      readyState: this.eventSource?.readyState,
+      url: this.eventSource ? this.eventSource.url : null,
+      lastError: this.lastError,
+      isOpen: this.isOpen,
+      eventSource: this.eventSource ? 'eventSource has been initialized' : 'eventSource not yet initialized',
+    };
+  }
+
+  public setDebugMode(val: boolean) {
+    this.debugEnabled = val;
+    if (val) {
+      this.logMsg(`debug logging is enabled!`);
+    }
+  }
+
+  public pushMockMessage(msg: MockMessage): MethodResult {
+    if (this.eventSource !== null) {
+      return this.logError(
+        `pushMockMessage`,
+        {
+          ok: false,
+          error: `Unable to push mock message when EventSource is not null (and active).`,
+        }
+      );
+    }
+    this.mockingActive = true;
+    this.onMessageRawCallback(new MessageEvent(msg.type, { data: msg.data }));
+    return {
+      ok: true,
+    };
+  }
+}
diff --git a/web/src/api/types/events.ts b/web/src/api/types/events.ts
new file mode 100644
index 000000000..a8c97ee15
--- /dev/null
+++ b/web/src/api/types/events.ts
@@ -0,0 +1,89 @@
+// Copyright (C) 2023 by Posit Software, PBC.
+
+export enum EventSourceReadyState {
+  CONNECTING = 0,
+  OPEN = 1,
+  CLOSED = 2,
+}
+
+// export const isSomeStringEnum =
+//   // eslint-disable-next-line @typescript-eslint/no-explicit-any
+//   <T>(e: T) => (token: any): token is T[keyof T] => Object.values(e).includes(token as T[keyof T]);
+
+export enum EventStreamMessageTypes {
+  ERROR = 'error',
+  LOG = 'log',
+}
+
+export type EventStreamMessage = {
+  type: EventSubscriptionTargets,
+  time: string,
+  // needed until we define the real types
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  data?: any,
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function isEventStreamMessage(o: any): o is EventStreamMessage {
+  return (
+    'type' in o &&
+    'time' in o &&
+    'data' in o
+  );
+}
+
+export type OnMessageEventSourceCallback = (msg: EventStreamMessage) => void;
+
+export type MethodResult = {
+  ok: boolean,
+  error?: string,
+}
+
+export type EventStatus = {
+  isOpen: boolean | undefined,
+  eventSource: string,
+  withCredentials: boolean | undefined,
+  readyState: EventSourceReadyState | undefined,
+  url: string | null,
+  lastError: string | null,
+}
+
+export type MockMessage = {
+  type: string,
+  data: string,
+}
+
+export type EventSubscriptionTargets =
+  '*' | // all events
+
+  'agent/log' | // agent console log messages
+
+  'errors/*' | // all errors
+  'errors/sse' |
+  'errors/open' |
+  'errors/unknownEvent' |
+
+  'open/*' | // open events
+  'open/sse' |
+
+  'publish/createBundle/start' |
+  'publish/createBundle/success' |
+
+  'publish/createDeployment/start' |
+  'publish/createDeployment/success' |
+
+  'publish/uploadBundle/start' |
+  'publish/uploadBundle/success' |
+
+  'publish/deployBundle/start' |
+  'publish/deployBundle/success' |
+
+  'publish/**/log' |
+
+  'publish/restorePythonEnv/log' |
+  'publish/restorePythonEnv/success' |
+
+  'publish/runContent/log' |
+  'publish/runContent/success' |
+
+  'publish/success';
diff --git a/web/src/components/publishProcess/PublishProcess.vue b/web/src/components/publishProcess/PublishProcess.vue
index f221b4d35..9bee3315f 100644
--- a/web/src/components/publishProcess/PublishProcess.vue
+++ b/web/src/components/publishProcess/PublishProcess.vue
@@ -8,21 +8,74 @@
   >
     <div>
       <q-btn
+        :disable="backButtonDisabled"
         color="primary"
         icon="arrow_back"
         label="Back"
         @click="onBackButton"
       />
     </div>
+    <div class="q-mt-lg">
+      <h4>Temporary Event Display for Publishing Process</h4>
+      <div
+        v-for="(eventItem, index) in events"
+        :key="index"
+      >
+        {{ eventItem }}
+      </div>
+      <p ref="agentLogEnd">
+        &nbsp;
+      </p>
+    </div>
   </q-page>
 </template>
 
 <script setup lang="ts">
 
+import { EventStream } from 'src/api/resources/EventStream';
+import { EventStreamMessage } from 'src/api/types/events';
+import { PropType, onBeforeUnmount, ref, watch } from 'vue';
+import { scroll as qScroll } from 'quasar';
+const { getScrollTarget, setVerticalScrollPosition } = qScroll;
+
+const props = defineProps({
+  events: {
+    type: Array as PropType<EventStreamMessage[]>,
+    required: true,
+  },
+  eventStream: {
+    type: Object as PropType<EventStream>,
+    required: true,
+  }
+});
+
+const agentLogEnd = ref(null);
+
 const emit = defineEmits(['back']);
 
 const onBackButton = () => {
   emit('back');
 };
 
+const backButtonDisabled = ref(true);
+
+const publishingComplete = () => {
+  backButtonDisabled.value = false;
+};
+props.eventStream.addEventMonitorCallback(['publish/success'], publishingComplete);
+
+watch(props.events, () => {
+  if (agentLogEnd.value) {
+    const el = agentLogEnd.value as HTMLDivElement;
+    const target = getScrollTarget(el);
+    const offset = el.offsetTop;
+    const duration = 1000;
+    setVerticalScrollPosition(target, offset, duration);
+  }
+});
+
+onBeforeUnmount(() => {
+  props.eventStream.delEventFilterCallback(publishingComplete);
+});
+
 </script>

From 6b7478ea7452bab018f1ac39bd93586c7dd42a58 Mon Sep 17 00:00:00 2001
From: Bill Sager <whs@sager.org>
Date: Thu, 21 Sep 2023 16:23:57 -0700
Subject: [PATCH 29/33] add automation tag

---
 web/src/components/publishProcess/PublishProcess.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/components/publishProcess/PublishProcess.vue b/web/src/components/publishProcess/PublishProcess.vue
index 9bee3315f..eebd629fe 100644
--- a/web/src/components/publishProcess/PublishProcess.vue
+++ b/web/src/components/publishProcess/PublishProcess.vue
@@ -12,6 +12,7 @@
         color="primary"
         icon="arrow_back"
         label="Back"
+        data-automation="BackToConfiguration"
         @click="onBackButton"
       />
     </div>

From 3f670f5a446cfc9829b8d94c0ebcd3f09d93cbe9 Mon Sep 17 00:00:00 2001
From: Bill Sager <whs@sager.org>
Date: Fri, 22 Sep 2023 12:55:09 -0700
Subject: [PATCH 30/33] switch from console.debug to console.log

---
 web/src/api/resources/EventStream.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/api/resources/EventStream.ts b/web/src/api/resources/EventStream.ts
index 66d77e336..267d6bb16 100644
--- a/web/src/api/resources/EventStream.ts
+++ b/web/src/api/resources/EventStream.ts
@@ -33,7 +33,7 @@ export class EventStream {
 
   private logMsg(msg: string) {
     if (this.debugEnabled) {
-      console.debug(`DEBUG: ${msg}`);
+      console.log(`DEBUG: ${msg}`);
     }
   }
 

From feb84465f6f165297a23c2499227f987fb75adf8 Mon Sep 17 00:00:00 2001
From: Bill Sager <sager.bill@gmail.com>
Date: Fri, 22 Sep 2023 14:44:14 -0700
Subject: [PATCH 31/33] Update
 web/src/components/publishProcess/PublishProcess.vue

Co-authored-by: Jordan Jensen <jordan.jensen@rstudio.com>
---
 web/src/components/publishProcess/PublishProcess.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/components/publishProcess/PublishProcess.vue b/web/src/components/publishProcess/PublishProcess.vue
index eebd629fe..9f866ee1e 100644
--- a/web/src/components/publishProcess/PublishProcess.vue
+++ b/web/src/components/publishProcess/PublishProcess.vue
@@ -50,7 +50,7 @@ const props = defineProps({
   }
 });
 
-const agentLogEnd = ref(null);
+const agentLogEnd = ref<HTMLDivElement | null>(null);
 
 const emit = defineEmits(['back']);
 

From 6d7b7bfe5b75780c3f0b087199acf0e7ba9a6f8b Mon Sep 17 00:00:00 2001
From: Bill Sager <sager.bill@gmail.com>
Date: Fri, 22 Sep 2023 14:50:53 -0700
Subject: [PATCH 32/33] Update web/src/api/types/events.ts

Co-authored-by: Jordan Jensen <jordan.jensen@rstudio.com>
---
 web/src/api/types/events.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web/src/api/types/events.ts b/web/src/api/types/events.ts
index a8c97ee15..6a57f752b 100644
--- a/web/src/api/types/events.ts
+++ b/web/src/api/types/events.ts
@@ -6,9 +6,6 @@ export enum EventSourceReadyState {
   CLOSED = 2,
 }
 
-// export const isSomeStringEnum =
-//   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-//   <T>(e: T) => (token: any): token is T[keyof T] => Object.values(e).includes(token as T[keyof T]);
 
 export enum EventStreamMessageTypes {
   ERROR = 'error',

From dac82ea1889b4c060d7c6d8622d0cdd5b26c3de7 Mon Sep 17 00:00:00 2001
From: Bill Sager <whs@sager.org>
Date: Fri, 22 Sep 2023 15:47:25 -0700
Subject: [PATCH 33/33] PR improvements.

---
 web/src/api/resources/EventStream.ts | 79 +++++++++-------------------
 web/src/api/types/events.ts          | 26 ++++-----
 2 files changed, 35 insertions(+), 70 deletions(-)

diff --git a/web/src/api/resources/EventStream.ts b/web/src/api/resources/EventStream.ts
index 267d6bb16..f286aad1f 100644
--- a/web/src/api/resources/EventStream.ts
+++ b/web/src/api/resources/EventStream.ts
@@ -6,24 +6,13 @@ import {
   OnMessageEventSourceCallback,
   MethodResult,
   EventStatus,
-  MockMessage,
   EventStreamMessage,
   isEventStreamMessage,
-  EventSubscriptionTargets,
+  EventSubscriptionTarget,
+  CallbackQueueEntry,
 } from 'src/api/types/events.ts';
 
-export type OurMessageEvent = {
-  data: string,
-}
-
-export type CallbackQueueEntry = {
-  eventType: EventSubscriptionTargets,
-  callback: OnMessageEventSourceCallback,
-}
-
 export class EventStream {
-  private mockMessages = <MockMessage[] | null>null;
-  private mockingActive = false;
   private eventSource = <EventSource | null>null;
   private isOpen = false;
   private lastError = <string | null>null;
@@ -43,8 +32,8 @@ export class EventStream {
   }
 
   private matchEvent(
-    subscriptionType: EventSubscriptionTargets,
-    incomingEventType: EventSubscriptionTargets
+    subscriptionType: EventSubscriptionTarget,
+    incomingEventType: EventSubscriptionTarget
   ) {
     this.logMsg(`MatchEvent: subscription type: ${subscriptionType}, incomingType: ${incomingEventType}`);
     if (subscriptionType.indexOf('*') === 0) {
@@ -52,6 +41,7 @@ export class EventStream {
       return true;
     }
     const wildCardIndex = subscriptionType.indexOf('/*');
+    // Does the wildcard live at the very end of the subscription type?
     if (wildCardIndex > 0 && subscriptionType.length === wildCardIndex + 2) {
       const basePath = subscriptionType.substring(0, wildCardIndex);
       if (incomingEventType.indexOf(basePath) === 0) {
@@ -59,9 +49,15 @@ export class EventStream {
         return true;
       }
     }
+    // Are we using a glob, which is meant to be in the middle of two strings
+    // which need to be matched
     const globIndex = subscriptionType.indexOf('/**/');
     if (globIndex > 0) {
+      // split our subscription type string into two parts (before and after the glob characters)
       const parts = subscriptionType.split('/**/');
+      // to match, we must make sure we find that the incoming event type starts
+      // exactly with our first part and ends with exactly our second part, regardless of how
+      // many characters in the incoming event type are "consumed" by our glob query.
       if (
         incomingEventType.indexOf(parts[0]) === 0 &&
         incomingEventType.indexOf(parts[1]) === incomingEventType.length - parts[1].length
@@ -116,18 +112,15 @@ export class EventStream {
     this.dispatchMessage({
       type: 'errors/open',
       time: now.toString(),
-      data: `{ msg: ${this.lastError} }`,
+      data: { msg: `${this.lastError}` },
     });
   }
 
   private parseMessageData(data: string) : EventStreamMessage | null {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const rawObj: any = JSON.parse(data);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const obj: any = camelcaseKeys(rawObj);
-    // Type safety guard!
+    const rawObj = JSON.parse(data);
+    const obj = camelcaseKeys(rawObj);
     if (isEventStreamMessage(obj)) {
-      return obj as EventStreamMessage;
+      return obj;
     }
     return null;
   }
@@ -141,7 +134,7 @@ export class EventStream {
       this.dispatchMessage({
         type: 'errors/open',
         time: now.toString(),
-        data: `{ msg: "${errorMsg}" }`,
+        data: { msg: `${errorMsg}` },
       });
       return;
     }
@@ -150,19 +143,12 @@ export class EventStream {
   }
 
   private initializeConnection(url: string, withCredentials: boolean): MethodResult {
-    if (!this.mockingActive) {
-      this.logMsg(`initializing non-mocking connection to ${url}, with credentials: ${withCredentials}`);
-      this.eventSource = new EventSource(url, { withCredentials: withCredentials });
-      this.eventSource.onopen = () => this.onRawOpenCallback();
-      // nothing good seems to come with the error data. Only get {"isTrusted":true}
-      this.eventSource.onerror = (e) => this.onErrorRawCallback(e);
-      this.eventSource.onmessage = (msg: MessageEvent) => this.onMessageRawCallback(msg);
-    } else if (this.mockMessages) {
-      this.logMsg(`initializing mocked connection to ${url}, with credentials: ${withCredentials}, loading ${this.mockMessages.length} messages`);
-      this.mockMessages.forEach(msg => {
-        this.onMessageRawCallback(new MessageEvent('message', { data: msg.data }));
-      });
-    }
+    this.logMsg(`initializing connection to ${url}, with credentials: ${withCredentials}`);
+    this.eventSource = new EventSource(url, { withCredentials: withCredentials });
+    this.eventSource.onopen = () => this.onRawOpenCallback();
+    // nothing good seems to come with the error data. Only get {"isTrusted":true}
+    this.eventSource.onerror = (e) => this.onErrorRawCallback(e);
+    this.eventSource.onmessage = (msg: MessageEvent) => this.onMessageRawCallback(msg);
     return {
       ok: true,
     };
@@ -192,7 +178,7 @@ export class EventStream {
   }
 
   public close(): MethodResult {
-    if (this.isOpen && !this.mockingActive && this.eventSource !== null) {
+    if (this.isOpen && this.eventSource !== null) {
       this.eventSource.close();
       this.eventSource = null;
       this.isOpen = false;
@@ -210,7 +196,7 @@ export class EventStream {
   }
 
   public addEventMonitorCallback(
-    targets: EventSubscriptionTargets[],
+    targets: EventSubscriptionTarget[],
     cb: OnMessageEventSourceCallback
   ) {
     for (const t in targets) {
@@ -258,21 +244,4 @@ export class EventStream {
       this.logMsg(`debug logging is enabled!`);
     }
   }
-
-  public pushMockMessage(msg: MockMessage): MethodResult {
-    if (this.eventSource !== null) {
-      return this.logError(
-        `pushMockMessage`,
-        {
-          ok: false,
-          error: `Unable to push mock message when EventSource is not null (and active).`,
-        }
-      );
-    }
-    this.mockingActive = true;
-    this.onMessageRawCallback(new MessageEvent(msg.type, { data: msg.data }));
-    return {
-      ok: true,
-    };
-  }
 }
diff --git a/web/src/api/types/events.ts b/web/src/api/types/events.ts
index 6a57f752b..c882308dc 100644
--- a/web/src/api/types/events.ts
+++ b/web/src/api/types/events.ts
@@ -6,22 +6,18 @@ export enum EventSourceReadyState {
   CLOSED = 2,
 }
 
-
-export enum EventStreamMessageTypes {
+export enum EventStreamMessageType {
   ERROR = 'error',
   LOG = 'log',
 }
 
 export type EventStreamMessage = {
-  type: EventSubscriptionTargets,
+  type: EventSubscriptionTarget,
   time: string,
-  // needed until we define the real types
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  data?: any,
+  data: object,
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isEventStreamMessage(o: any): o is EventStreamMessage {
+export function isEventStreamMessage(o: object): o is EventStreamMessage {
   return (
     'type' in o &&
     'time' in o &&
@@ -37,20 +33,20 @@ export type MethodResult = {
 }
 
 export type EventStatus = {
-  isOpen: boolean | undefined,
+  isOpen?: boolean,
   eventSource: string,
-  withCredentials: boolean | undefined,
-  readyState: EventSourceReadyState | undefined,
+  withCredentials?: boolean,
+  readyState?: EventSourceReadyState,
   url: string | null,
   lastError: string | null,
 }
 
-export type MockMessage = {
-  type: string,
-  data: string,
+export type CallbackQueueEntry = {
+  eventType: EventSubscriptionTarget,
+  callback: OnMessageEventSourceCallback,
 }
 
-export type EventSubscriptionTargets =
+export type EventSubscriptionTarget =
   '*' | // all events
 
   'agent/log' | // agent console log messages